diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2012-06-27 12:58:21 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2012-06-27 12:58:21 +0000 |
| commit | ec0422aa3333200cb1b7fdf3a2a34fc3ca993c51 (patch) | |
| tree | ae82c0fb1660d30e791d96afb3f00cbeb331ffb2 | |
| parent | 6973c3b9daf970849a7d881f31f9c501422b4fb8 (diff) | |
PR#5661: fixes for the test suite
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12651 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | testsuite/makefiles/Makefile.one | 3 | ||||
| -rw-r--r-- | testsuite/tests/asmcomp/i386.S | 3 | ||||
| -rw-r--r-- | testsuite/tests/asmcomp/sparc.S | 2 | ||||
| -rw-r--r-- | testsuite/tests/lib-scanf-2/Makefile | 3 |
5 files changed, 8 insertions, 4 deletions
@@ -158,6 +158,7 @@ Bug Fixes: - PR#5610: new unmarshaler (from PR#5318) fails to freshen object identifiers - PR#5620: invalid printing of type manifest (camlp4 revised syntax) - PR#5643: issues with .cfi and .loc directives generated by ocamlopt -g +- PR#5661: fixes for the test suite - problem with printing of string literals in camlp4 (reported on caml-list) - emacs mode: colorization of comments and strings now works correctly diff --git a/testsuite/makefiles/Makefile.one b/testsuite/makefiles/Makefile.one index ca07bf16d..ae763bf57 100644 --- a/testsuite/makefiles/Makefile.one +++ b/testsuite/makefiles/Makefile.one @@ -20,12 +20,13 @@ ADD_CFLAGS+=$(CUSTOM_FLAG) default: compile run -compile: $(ML_FILES) $(CMO_FILES) $(CMX_FILES) $(MAIN_MODULE).cmo $(MAIN_MODULE).cmx +compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo @for file in $(C_FILES); do \ $(NATIVECC) $(NATIVECCCOMPOPTS) -c -I$(TOPDIR)/byterun $$file.c; \ done; @$(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte $(O_FILES) $(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) $(MAIN_MODULE).cmo @if [ -z "$(BYTECODE_ONLY)" ]; then \ + $(MAKE) $(CMX_FILES) $(MAIN_MODULE).cmx; \ $(OCAMLOPT) $(ADD_COMPFLAGS) -o program.native $(O_FILES) $(CMXA_FILES) $(CMX_FILES) $(ADD_CMX_FILES) $(MAIN_MODULE).cmx; \ fi diff --git a/testsuite/tests/asmcomp/i386.S b/testsuite/tests/asmcomp/i386.S index fc75b1f1f..94e44c773 100644 --- a/testsuite/tests/asmcomp/i386.S +++ b/testsuite/tests/asmcomp/i386.S @@ -15,7 +15,8 @@ /* Linux with ELF binaries does not prefix identifiers with _. Linux with a.out binaries, FreeBSD, and NextStep do. */ -#ifdef SYS_linux_elf +#if defined(SYS_linux_elf) || defined(SYS_bsd_elf) \ + || defined(SYS_solaris) || defined(SYS_beos) || defined(SYS_gnu) #define G(x) x #define FUNCTION_ALIGN 16 #else diff --git a/testsuite/tests/asmcomp/sparc.S b/testsuite/tests/asmcomp/sparc.S index 5f83bf0f2..362c6f135 100644 --- a/testsuite/tests/asmcomp/sparc.S +++ b/testsuite/tests/asmcomp/sparc.S @@ -12,7 +12,7 @@ /* $Id$ */ -#ifndef SYS_solaris +#if defined(SYS_solaris) || defined(SYS_elf) #define Call_gen_code _call_gen_code #define Caml_c_call _caml_c_call #else diff --git a/testsuite/tests/lib-scanf-2/Makefile b/testsuite/tests/lib-scanf-2/Makefile index 216b39630..7362fad9c 100644 --- a/testsuite/tests/lib-scanf-2/Makefile +++ b/testsuite/tests/lib-scanf-2/Makefile @@ -2,10 +2,11 @@ BASEDIR=../.. default: compile run -compile: tscanf2_io.cmo tscanf2_io.cmx +compile: tscanf2_io.cmo @$(OCAMLC) unix.cma tscanf2_io.cmo -o master.byte tscanf2_master.ml @$(OCAMLC) tscanf2_io.cmo -o slave.byte tscanf2_slave.ml @if [ -z "$(BYTECODE_ONLY)" ]; then \ + $(MAKE) tscanf2_io.cmx; \ $(OCAMLOPT) unix.cmxa tscanf2_io.cmx -o master.native tscanf2_master.ml; \ $(OCAMLOPT) tscanf2_io.cmx -o slave.native tscanf2_slave.ml; \ fi |