diff options
| author | Jérémie Dimino <jeremie@dimino.org> | 2015-08-25 16:18:50 +0000 |
|---|---|---|
| committer | Jérémie Dimino <jeremie@dimino.org> | 2015-08-25 16:18:50 +0000 |
| commit | 7a3517bcbecaab8c4f7c03461a78cf7f6e3bc36a (patch) | |
| tree | 94cb09310cca8c731392f1377bf19879668bcd19 | |
| parent | e7593340c104084ad8ef521c0baa9b9ae6e78af0 (diff) | |
| download | ocaml-7a3517bcbecaab8c4f7c03461a78cf7f6e3bc36a.tar.gz | |
Allow tests to be native code only
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16386 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/makefiles/Makefile.common | 1 | ||||
| -rw-r--r-- | testsuite/makefiles/Makefile.one | 23 |
2 files changed, 16 insertions, 8 deletions
diff --git a/testsuite/makefiles/Makefile.common b/testsuite/makefiles/Makefile.common index 851a85bddf..3e6cc588e3 100644 --- a/testsuite/makefiles/Makefile.common +++ b/testsuite/makefiles/Makefile.common @@ -69,6 +69,7 @@ OCAMLYACC=$(TOPDIR)/yacc/ocamlyacc$(EXE) OCAMLBUILD=$(TOPDIR)/_build/ocamlbuild/ocamlbuild.native DUMPOBJ=$(OCAMLRUN) $(OTOPDIR)/tool/dumpobj BYTECODE_ONLY=[ "$(ARCH)" = "none" -o "$(ASM)" = "none" ] +NATIVECODE_ONLY=false #FORTRAN_COMPILER= #FORTRAN_LIBRARY= diff --git a/testsuite/makefiles/Makefile.one b/testsuite/makefiles/Makefile.one index 11c227ee4c..cebf7fcc2e 100644 --- a/testsuite/makefiles/Makefile.one +++ b/testsuite/makefiles/Makefile.one @@ -37,14 +37,17 @@ default: @$(SET_LD_PATH) $(MAKE) run .PHONY: compile -compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo +compile: $(ML_FILES) @for file in $(C_FILES); do \ $(NATIVECC) $(NATIVECCCOMPOPTS) -c -I$(CTOPDIR)/byterun $$file.c; \ done; - @rm -f program.byte program.byte.exe - @$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte$(EXE) \ - $(O_FILES) $(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) \ - $(MAIN_MODULE).cmo + @if $(NATIVECODE_ONLY); then : ; else \ + rm -f program.byte program.byte.exe; \ + $(MAKE) $(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; \ + fi @if $(BYTECODE_ONLY); then : ; else \ rm -f program.native program.native.exe; \ $(MAKE) $(CMX_FILES) $(MAIN_MODULE).cmx; \ @@ -56,9 +59,13 @@ compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo .PHONY: run run: - @printf " ... testing with ocamlc" - @$(MYRUNTIME) ./program.byte$(EXE) $(EXEC_ARGS) >$(MAIN_MODULE).result\ - && $(DIFF) $(MAIN_MODULE).reference $(MAIN_MODULE).result >/dev/null \ + @printf " ... testing with" + @if $(NATIVECODE_ONLY); then : ; else \ + printf " ocamlc"; \ + $(MYRUNTIME) ./program.byte$(EXE) $(EXEC_ARGS) \ + >$(MAIN_MODULE).result \ + && $(DIFF) $(MAIN_MODULE).reference $(MAIN_MODULE).result >/dev/null; \ + fi \ && if $(BYTECODE_ONLY); then : ; else \ printf " ocamlopt"; \ ./program.native$(EXE) $(EXEC_ARGS) > $(MAIN_MODULE).result \ |