diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-05-16 15:20:48 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-05-16 15:20:48 +0000 |
| commit | 98c197a63b655e9a9c698fe58e987fa6c3714a4c (patch) | |
| tree | 16ed0ffeee519507b934b3644e9fc46f6ce29182 /testsuite/makefiles/Makefile.one | |
| parent | a3b1c67fffd7de640ee9a0791f1fd0fad965b867 (diff) | |
testsuite: allow testing without installing (continued)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13686 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'testsuite/makefiles/Makefile.one')
| -rw-r--r-- | testsuite/makefiles/Makefile.one | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/testsuite/makefiles/Makefile.one b/testsuite/makefiles/Makefile.one index 527f3dd0e..5acfc5b6d 100644 --- a/testsuite/makefiles/Makefile.one +++ b/testsuite/makefiles/Makefile.one @@ -27,11 +27,13 @@ GENERATED_SOURCES=$(ML_LEX_FILES) $(ML_YACC_FILES) $(MLI_YACC_FILES) CUSTOM_FLAG=`if [ -n "$(C_FILES)" ]; then echo '-custom'; fi` ADD_CFLAGS+=$(CUSTOM_FLAG) +MYRUNTIME=`if [ -z "$(C_FILES)" ]; then echo '$(OCAMLRUN)'; fi` CC=$(NATIVECC) $(NATIVECCCOMPOPTS) .PHONY: default -default: compile run +default: + @LD_LIBRARY_PATH='$(LD_LIBRARY_PATH)' $(MAKE) compile run .PHONY: compile compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo @@ -39,12 +41,13 @@ compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo $(NATIVECC) $(NATIVECCCOMPOPTS) -c -I$(CTOPDIR)/byterun $$file.c; \ done; @rm -f program.byte program.byte.exe - @$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte $(O_FILES) \ - $(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) $(MAIN_MODULE).cmo + @$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte$(EXE) \ + $(O_FILES) $(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) \ + $(MAIN_MODULE).cmo @if $(BYTECODE_ONLY); then : ; else \ rm -f program.native program.native.exe; \ $(MAKE) $(CMX_FILES) $(MAIN_MODULE).cmx; \ - $(OCAMLOPT) $(ADD_COMPFLAGS) -o program.native $(O_FILES) \ + $(OCAMLOPT) $(ADD_COMPFLAGS) -o program.native$(EXE) $(O_FILES) \ $(CMXA_FILES) $(CMX_FILES) $(ADD_CMX_FILES) \ $(MAIN_MODULE).cmx; \ fi @@ -52,11 +55,11 @@ compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo .PHONY: run run: @printf " ... testing with ocamlc" - @./program.byte $(EXEC_ARGS) >$(MAIN_MODULE).result \ + @$(MYRUNTIME) ./program.byte$(EXE) $(EXEC_ARGS) >$(MAIN_MODULE).result\ && $(DIFF) $(MAIN_MODULE).reference $(MAIN_MODULE).result >/dev/null \ && if $(BYTECODE_ONLY); then : ; else \ printf " ocamlopt"; \ - ./program.native $(EXEC_ARGS) > $(MAIN_MODULE).result \ + ./program.native$(EXE) $(EXEC_ARGS) > $(MAIN_MODULE).result \ && $(DIFF) $(MAIN_MODULE).reference $(MAIN_MODULE).result \ >/dev/null; \ fi \ @@ -68,5 +71,6 @@ promote: defaultpromote .PHONY: clean clean: defaultclean - @rm -f *.result program program.exe $(GENERATED_SOURCES) $(O_FILES) \ - $(TEST_TEMP_FILES) + @rm -f *.result program.byte program.byte.exe \ + program.native program.native.exe \ + $(GENERATED_SOURCES) $(O_FILES) $(TEST_TEMP_FILES) |