Commits

Anonymous committed 6a26a6f

PR#5661: fixes for the test suite

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12651f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Comments (0)

Files changed (5)

 - 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
 

testsuite/makefiles/Makefile.one

 
 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
 

testsuite/tests/asmcomp/i386.S

 /* 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

testsuite/tests/asmcomp/sparc.S

 
 /* $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

testsuite/tests/lib-scanf-2/Makefile

 
 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