diff options
52 files changed, 152 insertions, 90 deletions
diff --git a/testsuite/interactive/lib-gc/Makefile b/testsuite/interactive/lib-gc/Makefile index 4eb07e7e9f..65bd44d1f4 100644 --- a/testsuite/interactive/lib-gc/Makefile +++ b/testsuite/interactive/lib-gc/Makefile @@ -1,3 +1,5 @@ +BASEDIR=../.. + default: @$(OCAMLC) -o program.byte alloc.ml @./program.byte @@ -7,4 +9,4 @@ default: clean: defaultclean @rm -fr program.* -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/interactive/lib-graph-2/Makefile b/testsuite/interactive/lib-graph-2/Makefile index 6ede5e50bf..9a5c0c5f4c 100644 --- a/testsuite/interactive/lib-graph-2/Makefile +++ b/testsuite/interactive/lib-graph-2/Makefile @@ -1,7 +1,8 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=graph_test #ADD_COMPFLAGS= LIBRARIES=graphics -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/interactive/lib-graph-3/Makefile b/testsuite/interactive/lib-graph-3/Makefile index a37aa33d61..6f0660a991 100644 --- a/testsuite/interactive/lib-graph-3/Makefile +++ b/testsuite/interactive/lib-graph-3/Makefile @@ -1,7 +1,8 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=sorts ADD_COMPFLAGS=-thread LIBRARIES=unix threads graphics -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/interactive/lib-graph/Makefile b/testsuite/interactive/lib-graph/Makefile index be82565857..61f472b3a6 100644 --- a/testsuite/interactive/lib-graph/Makefile +++ b/testsuite/interactive/lib-graph/Makefile @@ -1,7 +1,8 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=graph_example #ADD_COMPFLAGS= LIBRARIES=graphics -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/interactive/lib-signals/Makefile b/testsuite/interactive/lib-signals/Makefile index 445f9ac701..ec22e06862 100644 --- a/testsuite/interactive/lib-signals/Makefile +++ b/testsuite/interactive/lib-signals/Makefile @@ -1,3 +1,5 @@ +BASEDIR=../.. + default: @$(OCAMLC) -o program.byte signals.ml @./program.byte @@ -7,4 +9,4 @@ default: clean: defaultclean @rm -fr program.* -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/asmcomp/Makefile b/testsuite/tests/asmcomp/Makefile index 583680deac..d0afb4cba3 100644 --- a/testsuite/tests/asmcomp/Makefile +++ b/testsuite/tests/asmcomp/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. CC=$(NATIVECC) CFLAGS=$(NATIVECCCOMPOPTS) -g @@ -139,6 +140,6 @@ power.o: power-$(SYSTEM).o @cp power-$(SYSTEM).o power.o -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common arch: $(ARCH).o diff --git a/testsuite/tests/backtrace/Makefile b/testsuite/tests/backtrace/Makefile index 68d042af04..2bd20c41f0 100644 --- a/testsuite/tests/backtrace/Makefile +++ b/testsuite/tests/backtrace/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. EXECNAME=./program run-all: @@ -13,4 +14,4 @@ run-all: clean: defaultclean @rm -f *.result $(EXECNAME) -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic-float/Makefile b/testsuite/tests/basic-float/Makefile index 627ed78848..dbe9b4dfe7 100644 --- a/testsuite/tests/basic-float/Makefile +++ b/testsuite/tests/basic-float/Makefile @@ -1,5 +1,6 @@ +BASEDIR=../.. MODULES=float_record MAIN_MODULE=tfloat_record -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic-io-2/Makefile b/testsuite/tests/basic-io-2/Makefile index 9a7d2ba00e..a5829bd15a 100644 --- a/testsuite/tests/basic-io-2/Makefile +++ b/testsuite/tests/basic-io-2/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=io EXEC_ARGS=io.ml -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic-io/Makefile b/testsuite/tests/basic-io/Makefile index b0edfabbb0..ac99445b7a 100644 --- a/testsuite/tests/basic-io/Makefile +++ b/testsuite/tests/basic-io/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=wc EXEC_ARGS=wc.ml -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic-manyargs/Makefile b/testsuite/tests/basic-manyargs/Makefile index ef8a4f546b..d84fc9baaa 100644 --- a/testsuite/tests/basic-manyargs/Makefile +++ b/testsuite/tests/basic-manyargs/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=manyargs C_FILES=manyargsprim -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic-more/Makefile b/testsuite/tests/basic-more/Makefile index 18f9c9b2cf..329d67de83 100644 --- a/testsuite/tests/basic-more/Makefile +++ b/testsuite/tests/basic-more/Makefile @@ -1,4 +1,5 @@ +BASEDIR=../.. MODULES=testing -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic-multdef/Makefile b/testsuite/tests/basic-multdef/Makefile index 79660b57fd..5ec6aff731 100644 --- a/testsuite/tests/basic-multdef/Makefile +++ b/testsuite/tests/basic-multdef/Makefile @@ -1,5 +1,6 @@ +BASEDIR=../.. MODULES=multdef MAIN_MODULE=usemultdef -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic-private/Makefile b/testsuite/tests/basic-private/Makefile index 99475d0f38..06c5591cc3 100644 --- a/testsuite/tests/basic-private/Makefile +++ b/testsuite/tests/basic-private/Makefile @@ -1,5 +1,7 @@ +BASEDIR=../.. + MODULES=length MAIN_MODULE=tlength -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/basic/Makefile b/testsuite/tests/basic/Makefile index a226dd11fc..4ba0bffc51 100644 --- a/testsuite/tests/basic/Makefile +++ b/testsuite/tests/basic/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/callback/Makefile b/testsuite/tests/callback/Makefile index 0cec7e63f4..92c14264de 100644 --- a/testsuite/tests/callback/Makefile +++ b/testsuite/tests/callback/Makefile @@ -1,3 +1,5 @@ +BASEDIR=../.. + CC=$(NATIVECC) -I $(TOPDIR)/byterun default: run-byte run-opt @@ -24,4 +26,4 @@ run-opt: common clean: defaultclean @rm -f *.result ./program -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile index 33b9544221..13f8dc5c84 100644 --- a/testsuite/tests/embedded/Makefile +++ b/testsuite/tests/embedded/Makefile @@ -1,3 +1,5 @@ +BASEDIR=../.. + default: compile run compile: @@ -15,4 +17,4 @@ run: clean: defaultclean @rm -f *.result ./program -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/gc-roots/Makefile b/testsuite/tests/gc-roots/Makefile index f07d6751ba..acaf918fa9 100644 --- a/testsuite/tests/gc-roots/Makefile +++ b/testsuite/tests/gc-roots/Makefile @@ -1,7 +1,8 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=globroots C_FILES=globrootsprim ADD_COMPFLAGS=-w a -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-bigarray-2/Makefile b/testsuite/tests/lib-bigarray-2/Makefile index 74b02913b2..678c8c88fb 100644 --- a/testsuite/tests/lib-bigarray-2/Makefile +++ b/testsuite/tests/lib-bigarray-2/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. LIBRARIES=unix bigarray C_FILES=bigarrfstub F_FILES=bigarrf -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-bigarray/Makefile b/testsuite/tests/lib-bigarray/Makefile index bb5076e756..5bfaa030eb 100644 --- a/testsuite/tests/lib-bigarray/Makefile +++ b/testsuite/tests/lib-bigarray/Makefile @@ -1,4 +1,5 @@ +BASEDIR=../.. LIBRARIES=unix bigarray -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-digest/Makefile b/testsuite/tests/lib-digest/Makefile index e81a715ad1..0e64db8f13 100644 --- a/testsuite/tests/lib-digest/Makefile +++ b/testsuite/tests/lib-digest/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=md5 ADD_COMPFLAGS=-w a -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile index 00ffc63ad3..1fd4c55cf6 100644 --- a/testsuite/tests/lib-dynlink-bytecode/Makefile +++ b/testsuite/tests/lib-dynlink-bytecode/Makefile @@ -1,3 +1,5 @@ +BASEDIR=../.. + default: compile run compile: @@ -33,4 +35,4 @@ run: clean: defaultclean @rm -f ./main ./static ./custom *.result -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-dynlink-csharp/Makefile b/testsuite/tests/lib-dynlink-csharp/Makefile index 774eaacac7..df7b999cd7 100644 --- a/testsuite/tests/lib-dynlink-csharp/Makefile +++ b/testsuite/tests/lib-dynlink-csharp/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. CSC=csc default: prepare bytecode bytecode-dll native native-dll @@ -55,4 +56,4 @@ native-dll: clean: defaultclean @rm -f *.result *.exe *.dll -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-dynlink-native/Makefile b/testsuite/tests/lib-dynlink-native/Makefile index 49bd04a17a..4b5091715a 100644 --- a/testsuite/tests/lib-dynlink-native/Makefile +++ b/testsuite/tests/lib-dynlink-native/Makefile @@ -1,3 +1,6 @@ +BASEDIR=../.. + + default: compile run PLUGINS=plugin.so plugin2.so sub/plugin.so sub/plugin3.so plugin4.so mypack.so packed1.so packed1_client.so pack_client.so plugin_ref.so plugin_high_arity.so plugin_ext.so plugin_simple.so bug.so plugin_thread.so plugin4_unix.so a.so b.so c.so @@ -67,4 +70,4 @@ clean: defaultclean @rm -f *.a *.lib @rm -f sub/*.so sub/*.o sub/*.cm* sub/*.s sub/*.asm sub/*.obj -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-hashtbl/Makefile b/testsuite/tests/lib-hashtbl/Makefile index a226dd11fc..4ba0bffc51 100644 --- a/testsuite/tests/lib-hashtbl/Makefile +++ b/testsuite/tests/lib-hashtbl/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-marshal/Makefile b/testsuite/tests/lib-marshal/Makefile index df63a1fd56..1f78273d3d 100644 --- a/testsuite/tests/lib-marshal/Makefile +++ b/testsuite/tests/lib-marshal/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=intext C_FILES=intextaux -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-num-2/Makefile b/testsuite/tests/lib-num-2/Makefile index 7b7ffec4f6..7a307e41c1 100644 --- a/testsuite/tests/lib-num-2/Makefile +++ b/testsuite/tests/lib-num-2/Makefile @@ -1,5 +1,6 @@ +BASEDIR=../.. LIBRARIES=nums PROGRAM_ARGS=1000 -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-num/Makefile b/testsuite/tests/lib-num/Makefile index 8b7b327a09..08ebbd97f4 100644 --- a/testsuite/tests/lib-num/Makefile +++ b/testsuite/tests/lib-num/Makefile @@ -1,7 +1,8 @@ +BASEDIR=../.. MODULES=test test_nats test_big_ints test_ratios test_nums test_io MAIN_MODULE=end_test ADD_COMPFLAGS=-w a LIBRARIES=nums -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-scanf-2/Makefile b/testsuite/tests/lib-scanf-2/Makefile index 90a0ea6d1e..ae08884f7c 100644 --- a/testsuite/tests/lib-scanf-2/Makefile +++ b/testsuite/tests/lib-scanf-2/Makefile @@ -1,3 +1,5 @@ +BASEDIR=../.. + default: compile run compile: tscanf2_io.cmo tscanf2_io.cmx @@ -18,4 +20,4 @@ run: clean: defaultclean @rm -f master.* slave.* result.* -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-scanf/Makefile b/testsuite/tests/lib-scanf/Makefile index 8f8b3c5b64..eba4701476 100644 --- a/testsuite/tests/lib-scanf/Makefile +++ b/testsuite/tests/lib-scanf/Makefile @@ -1,7 +1,8 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=tscanf ADD_COMPFLAGS=-I $(BASEDIR)/lib ADD_MODULES=testing -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-str/Makefile b/testsuite/tests/lib-str/Makefile index 530ea73079..35ad3003dd 100644 --- a/testsuite/tests/lib-str/Makefile +++ b/testsuite/tests/lib-str/Makefile @@ -1,4 +1,5 @@ +BASEDIR=../.. LIBRARIES=str -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-systhreads/Makefile b/testsuite/tests/lib-systhreads/Makefile index 80138b26ce..8729461a77 100644 --- a/testsuite/tests/lib-systhreads/Makefile +++ b/testsuite/tests/lib-systhreads/Makefile @@ -1,5 +1,6 @@ +BASEDIR=../.. LIBRARIES=unix threads ADD_COMPFLAGS=-thread -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/lib-threads/Makefile b/testsuite/tests/lib-threads/Makefile index 80138b26ce..8729461a77 100644 --- a/testsuite/tests/lib-threads/Makefile +++ b/testsuite/tests/lib-threads/Makefile @@ -1,5 +1,6 @@ +BASEDIR=../.. LIBRARIES=unix threads ADD_COMPFLAGS=-thread -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/misc-kb/Makefile b/testsuite/tests/misc-kb/Makefile index b5f5eaec97..1802e554e3 100644 --- a/testsuite/tests/misc-kb/Makefile +++ b/testsuite/tests/misc-kb/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. MODULES=terms equations orderings kb MAIN_MODULE=kbmain ADD_COMPFLAGS=-w a -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/misc-unsafe/Makefile b/testsuite/tests/misc-unsafe/Makefile index 82f7a72d65..f4a8b4e3b1 100644 --- a/testsuite/tests/misc-unsafe/Makefile +++ b/testsuite/tests/misc-unsafe/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. UNSAFE=ON -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/misc/Makefile b/testsuite/tests/misc/Makefile index a226dd11fc..4ba0bffc51 100644 --- a/testsuite/tests/misc/Makefile +++ b/testsuite/tests/misc/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/runtime-errors/Makefile b/testsuite/tests/runtime-errors/Makefile index 4945c1f805..62543b4dda 100644 --- a/testsuite/tests/runtime-errors/Makefile +++ b/testsuite/tests/runtime-errors/Makefile @@ -1,3 +1,5 @@ +BASEDIR=../.. + default: compile run compile: @@ -22,4 +24,4 @@ run: clean: defaultclean @rm -f *.bytecode *.native *.result -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/tool-lexyacc/Makefile b/testsuite/tests/tool-lexyacc/Makefile index b9260a5453..3d7f49be9f 100644 --- a/testsuite/tests/tool-lexyacc/Makefile +++ b/testsuite/tests/tool-lexyacc/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. MODULES=syntax gram_aux grammar scan_aux scanner lexgen output MAIN_MODULE=main LEX_MODULES=scanner @@ -5,5 +6,5 @@ YACC_MODULES=grammar ADD_COMPFLAGS=-w a EXEC_ARGS=input -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/tool-ocaml/Makefile b/testsuite/tests/tool-ocaml/Makefile index 2b2940fba1..626a0c2610 100644 --- a/testsuite/tests/tool-ocaml/Makefile +++ b/testsuite/tests/tool-ocaml/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. SHOULD_FAIL=t060-raise.ml compile: lib.cmo @@ -13,4 +14,4 @@ compile: lib.cmo clean: defaultclean @rm -f ./a.out -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/tool-ocamldoc/Makefile b/testsuite/tests/tool-ocamldoc/Makefile index 5e7398ba7d..672721c1ed 100644 --- a/testsuite/tests/tool-ocamldoc/Makefile +++ b/testsuite/tests/tool-ocamldoc/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. CUSTOM_MODULE=odoc_test ADD_COMPFLAGS=-I +ocamldoc @@ -14,4 +15,4 @@ run: $(CUSTOM_MODULE).cmo clean: defaultclean @rm -f *.result *.html *.tex *.log *.out *.sty *.toc *.css *.aux -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-fstclassmod/Makefile b/testsuite/tests/typing-fstclassmod/Makefile index a8a9622910..ea38ed37b3 100644 --- a/testsuite/tests/typing-fstclassmod/Makefile +++ b/testsuite/tests/typing-fstclassmod/Makefile @@ -1,6 +1,7 @@ +BASEDIR=../.. #MODULES= MAIN_MODULE=fstclassmod ADD_COMPFLAGS=-w a -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-labels/Makefile b/testsuite/tests/typing-labels/Makefile index a226dd11fc..4ba0bffc51 100644 --- a/testsuite/tests/typing-labels/Makefile +++ b/testsuite/tests/typing-labels/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.several -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.several +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-objects-bugs/Makefile b/testsuite/tests/typing-objects-bugs/Makefile index 9375ddba6f..1b07f20605 100644 --- a/testsuite/tests/typing-objects-bugs/Makefile +++ b/testsuite/tests/typing-objects-bugs/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.okbad -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.okbad +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-objects/Makefile b/testsuite/tests/typing-objects/Makefile index 9add15574f..5f42b70577 100644 --- a/testsuite/tests/typing-objects/Makefile +++ b/testsuite/tests/typing-objects/Makefile @@ -1,3 +1,4 @@ -include ../../makefiles/Makefile.toplevel -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.toplevel +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-poly/Makefile b/testsuite/tests/typing-poly/Makefile index 9add15574f..5f42b70577 100644 --- a/testsuite/tests/typing-poly/Makefile +++ b/testsuite/tests/typing-poly/Makefile @@ -1,3 +1,4 @@ -include ../../makefiles/Makefile.toplevel -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.toplevel +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-polyvariants-bugs-2/Makefile b/testsuite/tests/typing-polyvariants-bugs-2/Makefile index 3f01800ffa..9ecfbe381f 100644 --- a/testsuite/tests/typing-polyvariants-bugs-2/Makefile +++ b/testsuite/tests/typing-polyvariants-bugs-2/Makefile @@ -1,7 +1,8 @@ +BASEDIR=../.. default: @printf " ... testing 'pr3918':" @($(OCAMLC) -c pr3918a.mli && $(OCAMLC) -c pr3918b.mli && $(OCAMLC) -c pr3918c.ml && echo " => passed") || echo " => failed" clean: defaultclean -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-polyvariants-bugs/Makefile b/testsuite/tests/typing-polyvariants-bugs/Makefile index 9375ddba6f..1b07f20605 100644 --- a/testsuite/tests/typing-polyvariants-bugs/Makefile +++ b/testsuite/tests/typing-polyvariants-bugs/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.okbad -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.okbad +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-private-bugs/Makefile b/testsuite/tests/typing-private-bugs/Makefile index 9375ddba6f..1b07f20605 100644 --- a/testsuite/tests/typing-private-bugs/Makefile +++ b/testsuite/tests/typing-private-bugs/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.okbad -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.okbad +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-private/Makefile b/testsuite/tests/typing-private/Makefile index 9add15574f..5f42b70577 100644 --- a/testsuite/tests/typing-private/Makefile +++ b/testsuite/tests/typing-private/Makefile @@ -1,3 +1,4 @@ -include ../../makefiles/Makefile.toplevel -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.toplevel +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-recmod/Makefile b/testsuite/tests/typing-recmod/Makefile index 9375ddba6f..1b07f20605 100644 --- a/testsuite/tests/typing-recmod/Makefile +++ b/testsuite/tests/typing-recmod/Makefile @@ -1,2 +1,3 @@ -include ../../makefiles/Makefile.okbad -include ../../makefiles/Makefile.common +BASEDIR=../.. +include $(BASEDIR)/makefiles/Makefile.okbad +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/typing-typeparam/Makefile b/testsuite/tests/typing-typeparam/Makefile index ef9558e19e..d480252c5e 100644 --- a/testsuite/tests/typing-typeparam/Makefile +++ b/testsuite/tests/typing-typeparam/Makefile @@ -1,6 +1,7 @@ #MODULES= -MAIN_MODULE=newtype +MAIN_MOBASEDIR=../.. +DULE=newtype ADD_COMPFLAGS=-w a -include ../../makefiles/Makefile.one -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.one +include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/warnings/Makefile b/testsuite/tests/warnings/Makefile index 1c60154ee8..8a4c3dd9b0 100644 --- a/testsuite/tests/warnings/Makefile +++ b/testsuite/tests/warnings/Makefile @@ -1,3 +1,4 @@ +BASEDIR=../.. FLAGS=-w A EXECNAME=./program @@ -11,4 +12,4 @@ run-all: clean: defaultclean @rm -f *.result $(EXECNAME) -include ../../makefiles/Makefile.common +include $(BASEDIR)/makefiles/Makefile.common |