summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorGabriel Scherer <gabriel.scherer@gmail.com>2014-12-27 15:38:08 +0000
committerGabriel Scherer <gabriel.scherer@gmail.com>2014-12-27 15:38:08 +0000
commit68c8db418d41050561816dbdf44177e4e6961d5c (patch)
tree8ed38d9a24caf90c8ff785e79ba57514f969339a /testsuite
parent72a751dc8c7c18a75b1487ae255f277043d11c3f (diff)
downloadocaml-68c8db418d41050561816dbdf44177e4e6961d5c.tar.gz
PR#5887: windows testsuite fix
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15760 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/embedded/Makefile4
-rw-r--r--testsuite/tests/lib-dynlink-bytecode/Makefile2
-rw-r--r--testsuite/tests/lib-dynlink-native/Makefile2
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile
index 3d8661d9bd..43c27c97da 100644
--- a/testsuite/tests/embedded/Makefile
+++ b/testsuite/tests/embedded/Makefile
@@ -19,8 +19,8 @@ default:
.PHONY: compile
compile:
- @$(OCAMLC) -ccopt -I -ccopt $(TOPDIR)/byterun/caml cmstub.c
- @$(OCAMLC) -ccopt -I -ccopt $(TOPDIR)/byterun/caml cmmain.c
+ @$(OCAMLC) -ccopt -I -ccopt $(CTOPDIR)/byterun/caml cmstub.c
+ @$(OCAMLC) -ccopt -I -ccopt $(CTOPDIR)/byterun/caml cmmain.c
@$(OCAMLC) -c cmcaml.ml
@$(OCAMLC) -custom -o program cmstub.$(O) cmcaml.cmo cmmain.$(O)
diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile
index edda6c625a..f9b1c6f9c3 100644
--- a/testsuite/tests/lib-dynlink-bytecode/Makefile
+++ b/testsuite/tests/lib-dynlink-bytecode/Makefile
@@ -27,7 +27,7 @@ default:
compile:
@$(OCAMLC) -c registry.ml
@for file in stub*.c; do \
- $(OCAMLC) -ccopt -I -ccopt $(TOPDIR)/byterun/caml -c $$file; \
+ $(OCAMLC) -ccopt -I -ccopt $(CTOPDIR)/byterun/caml -c $$file; \
$(OCAMLMKLIB) -o `echo $$file | sed -e 's/stub/plug/' -e 's/\.c//'` \
`basename $$file c`$(O); \
done
diff --git a/testsuite/tests/lib-dynlink-native/Makefile b/testsuite/tests/lib-dynlink-native/Makefile
index f27438c298..1054e4afd4 100644
--- a/testsuite/tests/lib-dynlink-native/Makefile
+++ b/testsuite/tests/lib-dynlink-native/Makefile
@@ -104,7 +104,7 @@ mylib.cmxa: plugin.cmx plugin2.cmx
factorial.$(O): factorial.c
@$(OCAMLOPT) -c -ccopt "$(SHAREDCCCOMPOPTS)" -ccopt -I \
- -ccopt $(TOPDIR)/byterun/caml \
+ -ccopt $(CTOPDIR)/byterun/caml \
factorial.c
.PHONY: promote