summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2013-05-17 12:49:42 +0000
committerDamien Doligez <damien.doligez-inria.fr>2013-05-17 12:49:42 +0000
commitb1d2782b3022f795547002b3841bd70ca256a671 (patch)
tree74bd3f824d319b758875cc4d559cab32e4082cc7
parent3cc34fb267a5f675caf41e02946865339f54299b (diff)
testsuite: still making it work without installing
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13692 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--testsuite/tests/lib-dynlink-native/Makefile1
-rw-r--r--testsuite/tests/lib-scanf-2/Makefile2
-rw-r--r--testsuite/tests/lib-threads/Makefile2
3 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/tests/lib-dynlink-native/Makefile b/testsuite/tests/lib-dynlink-native/Makefile
index 1d7e7dd5b..80e422121 100644
--- a/testsuite/tests/lib-dynlink-native/Makefile
+++ b/testsuite/tests/lib-dynlink-native/Makefile
@@ -35,7 +35,6 @@ ADD_COMPFLAGS=-thread
.PHONY: compile
compile: $(PLUGINS) main$(EXE) mylib.so
- @$(MAKE) $(PLUGINS)
.PHONY: run
run:
diff --git a/testsuite/tests/lib-scanf-2/Makefile b/testsuite/tests/lib-scanf-2/Makefile
index 4b3c350fc..6b8d56b08 100644
--- a/testsuite/tests/lib-scanf-2/Makefile
+++ b/testsuite/tests/lib-scanf-2/Makefile
@@ -13,7 +13,7 @@
BASEDIR=../..
COMPFLAGS=-I $(OTOPDIR)/otherlibs/$(UNIXLIBVAR)unix
-LD_PATH=$(OTOPDIR)/otherlibs/$(UNIXLIBVAR)unix
+LD_PATH=$(TOPDIR)/otherlibs/$(UNIXLIBVAR)unix
.PHONY: default
default:
diff --git a/testsuite/tests/lib-threads/Makefile b/testsuite/tests/lib-threads/Makefile
index 88b34703a..fc098713f 100644
--- a/testsuite/tests/lib-threads/Makefile
+++ b/testsuite/tests/lib-threads/Makefile
@@ -14,7 +14,7 @@ BASEDIR=../..
LIBRARIES=unix threads
ADD_COMPFLAGS=-thread -I $(OTOPDIR)/otherlibs/systhreads \
-I $(OTOPDIR)/otherlibs/$(UNIXLIBVAR)unix
-LD_PATH=$(TOPDIR)/otherlibs/systhreads:$(OTOPDIR)/otherlibs/$(UNIXLIBVAR)unix
+LD_PATH=$(TOPDIR)/otherlibs/systhreads:$(TOPDIR)/otherlibs/$(UNIXLIBVAR)unix
include $(BASEDIR)/makefiles/Makefile.several
include $(BASEDIR)/makefiles/Makefile.common