cleanup; separate byte-code from native executables

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/new-test-framework@15842 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

31 files changed, 124 insertions, 158 deletions

diff --git a/testsuite/tests/asmcomp/Testcommon.sh b/testsuite/tests/asmcomp/Testcommon.sh
index d34e7befad..8f595116b4 100644
--- a/testsuite/tests/asmcomp/Testcommon.sh
+++ b/testsuite/tests/asmcomp/Testcommon.sh
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/arith.t b/testsuite/tests/asmcomp/arith.t
index 82f47e6feb..ba847bdf98 100644
--- a/testsuite/tests/asmcomp/arith.t
+++ b/testsuite/tests/asmcomp/arith.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/checkbound.t b/testsuite/tests/asmcomp/checkbound.t
index 531763a566..8f3f6f20c4 100644
--- a/testsuite/tests/asmcomp/checkbound.t
+++ b/testsuite/tests/asmcomp/checkbound.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/fib.t b/testsuite/tests/asmcomp/fib.t
index 6115a4f5b3..6d84a0b5ad 100644
--- a/testsuite/tests/asmcomp/fib.t
+++ b/testsuite/tests/asmcomp/fib.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/integr.t b/testsuite/tests/asmcomp/integr.t
index e27a8c4eef..493576c9f8 100644
--- a/testsuite/tests/asmcomp/integr.t
+++ b/testsuite/tests/asmcomp/integr.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/optargs.t b/testsuite/tests/asmcomp/optargs.t
index 913417d8ae..f6886a74cb 100644
--- a/testsuite/tests/asmcomp/optargs.t
+++ b/testsuite/tests/asmcomp/optargs.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/quicksort.t b/testsuite/tests/asmcomp/quicksort.t
index 78d4bfa281..48bb429f3d 100644
--- a/testsuite/tests/asmcomp/quicksort.t
+++ b/testsuite/tests/asmcomp/quicksort.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/quicksort2.t b/testsuite/tests/asmcomp/quicksort2.t
index 78d4bfa281..48bb429f3d 100644
--- a/testsuite/tests/asmcomp/quicksort2.t
+++ b/testsuite/tests/asmcomp/quicksort2.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/soli.t b/testsuite/tests/asmcomp/soli.t
index a229a4e49f..e7644f3a63 100644
--- a/testsuite/tests/asmcomp/soli.t
+++ b/testsuite/tests/asmcomp/soli.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/staticalloc.t b/testsuite/tests/asmcomp/staticalloc.t
index 913417d8ae..f6886a74cb 100644
--- a/testsuite/tests/asmcomp/staticalloc.t
+++ b/testsuite/tests/asmcomp/staticalloc.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/tagged-fib.t b/testsuite/tests/asmcomp/tagged-fib.t
index bbfbb04368..778e03068d 100644
--- a/testsuite/tests/asmcomp/tagged-fib.t
+++ b/testsuite/tests/asmcomp/tagged-fib.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/tagged-integr.t b/testsuite/tests/asmcomp/tagged-integr.t
index e27a8c4eef..493576c9f8 100644
--- a/testsuite/tests/asmcomp/tagged-integr.t
+++ b/testsuite/tests/asmcomp/tagged-integr.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/tagged-quicksort.t b/testsuite/tests/asmcomp/tagged-quicksort.t
index 78d4bfa281..48bb429f3d 100644
--- a/testsuite/tests/asmcomp/tagged-quicksort.t
+++ b/testsuite/tests/asmcomp/tagged-quicksort.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/tagged-tak.t b/testsuite/tests/asmcomp/tagged-tak.t
index dc1852b9ff..898e7e4aca 100644
--- a/testsuite/tests/asmcomp/tagged-tak.t
+++ b/testsuite/tests/asmcomp/tagged-tak.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/asmcomp/tak.t b/testsuite/tests/asmcomp/tak.t
index dc1852b9ff..898e7e4aca 100644
--- a/testsuite/tests/asmcomp/tak.t
+++ b/testsuite/tests/asmcomp/tak.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/backtrace/.ignore b/testsuite/tests/backtrace/.ignore
index 6ab4e50f53..1c119b608d 100644
--- a/testsuite/tests/backtrace/.ignore
+++ b/testsuite/tests/backtrace/.ignore
@@ -1 +1,2 @@
 *.tmp_*
+*.byt
diff --git a/testsuite/tests/backtrace/Makefile b/testsuite/tests/backtrace/Makefile
deleted file mode 100644
index 33ca1ed8bc..0000000000
--- a/testsuite/tests/backtrace/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#########################################################################
-#                                                                       #
-#                                 OCaml                                 #
-#                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
-#                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
-#   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the Q Public License version 1.0.                #
-#                                                                       #
-#########################################################################
-
-BASEDIR=../..
-EXECNAME=program$(EXE)
-
-ABCDFILES=backtrace.ml
-OTHERFILES=backtrace2.ml raw_backtrace.ml \
-           backtrace_deprecated.ml backtrace_slots.ml
-OTHERFILESNOINLINING=backtraces_and_finalizers.ml
-
-default:
-	$(MAKE) byte
-	@if $(BYTECODE_ONLY); then : ; else $(MAKE) native; fi
-
-.PHONY: byte
-byte:
-	@for file in $(ABCDFILES); do \
-	  rm -f program program.exe; \
-	  $(OCAMLC) -g -o $(EXECNAME) $$file; \
-	  for arg in a b c d ''; do \
-	    printf " ... testing '$$file' with ocamlc and argument '$$arg':"; \
-	    F="`basename $$file .ml`"; \
-	    (OCAMLRUNPARAM=b=1 $(OCAMLRUN) $(EXECNAME) $$arg || true) \
-	         >$$F.$$arg.byte.result 2>&1; \
-	    $(DIFF) $$F.$$arg.reference $$F.$$arg.byte.result >/dev/null \
-	    && echo " => passed" || echo " => failed"; \
-	  done; \
-	done
-	@for file in $(OTHERFILES); do \
-	  rm -f program program.exe; \
-	  $(OCAMLC) -g -o $(EXECNAME) $$file; \
-	  printf " ... testing '$$file' with ocamlc:"; \
-	  F="`basename $$file .ml`"; \
-	  (OCAMLRUNPARAM=b=1 $(OCAMLRUN) $(EXECNAME) $$arg || true) \
-	       >$$F.byte.result 2>&1; \
-	  $(DIFF) $$F.reference $$F.byte.result >/dev/null \
-	  && echo " => passed" || echo " => failed"; \
-	done
-
-.PHONY: native
-native:
-	@for file in $(ABCDFILES); do \
-	  rm -f program program.exe; \
-	  $(OCAMLOPT) -g -o $(EXECNAME) $$file; \
-	  for arg in a b c d ''; do \
-	    printf " ... testing '$$file' with ocamlopt and argument '$$arg':"; \
-	    F="`basename $$file .ml`"; \
-	    (OCAMLRUNPARAM=b=1 ./$(EXECNAME) $$arg || true) \
-	         >$$F.$$arg.native.result 2>&1; \
-	    $(DIFF) $$F.$$arg.reference $$F.$$arg.native.result >/dev/null \
-	    && echo " => passed" || echo " => failed"; \
-	  done; \
-	done
-	@for file in $(OTHERFILES); do \
-	  rm -f program program.exe; \
-	  $(OCAMLOPT) -g -o $(EXECNAME) $$file; \
-	  printf " ... testing '$$file' with ocamlopt:"; \
-	  F="`basename $$file .ml`"; \
-	  (OCAMLRUNPARAM=b=1 ./$(EXECNAME) $$arg || true) \
-	       >$$F.native.result 2>&1; \
-	  $(DIFF) $$F.reference $$F.native.result >/dev/null \
-	  && echo " => passed" || echo " => failed"; \
-	done;
-	@for file in $(OTHERFILESNOINLINING); do \
-	  rm -f program program.exe; \
-	  $(OCAMLOPT) -inline 0 -g -o $(EXECNAME) $$file; \
-	  printf " ... testing '$$file' with ocamlopt:"; \
-	  F="`basename $$file .ml`"; \
-	  (OCAMLRUNPARAM=b=1 ./$(EXECNAME) $$arg || true) \
-	       >$$F.native.result 2>&1; \
-	  $(DIFF) $$F.reference $$F.native.result >/dev/null \
-	  && echo " => passed" || echo " => failed"; \
-	done
-
-.PHONY: promote
-promote: defaultpromote
-
-.PHONY: clean
-clean: defaultclean
-	@rm -f *.result program program.exe
-
-include $(BASEDIR)/makefiles/Makefile.common
diff --git a/testsuite/tests/backtrace/Testcommon.sh b/testsuite/tests/backtrace/Testcommon.sh
index 1fa5293208..bd22780660 100644
--- a/testsuite/tests/backtrace/Testcommon.sh
+++ b/testsuite/tests/backtrace/Testcommon.sh
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/backtrace/backtrace.t b/testsuite/tests/backtrace/backtrace-a.t
index c8734d8cde..75cc6ee304 100644
--- a/testsuite/tests/backtrace/backtrace.t
+++ b/testsuite/tests/backtrace/backtrace-a.t
@@ -2,33 +2,13 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-Tcompflags=-g
-Texec_env=OCAMLRUNPARAM="${OCAMLRUNPARAM},b=1"
-
-# Watch out, the order here is relevant:
-Ttests=Tbyte_compile              # First compile with byte-code
-Tmultiple Tbyte_run a b c d none  # Then run byte-code tests
-Ttests="$Ttests Topt_compile"     # Then compile with native code
-Tmultiple Topt_run a b c d none   # Then run native tests
-
-Targs_a=a
-
-Targs_b=b
-Texit_b=2
-
-Targs_c=c
-Texit_c=2
-
-Targs_d=d
-Texit_d=2
-
-Targs_none=
-Texit_none=2
+. backtrace-common.sh
+Targs=a
diff --git a/testsuite/tests/backtrace/backtrace-b.t b/testsuite/tests/backtrace/backtrace-b.t
new file mode 100644
index 0000000000..b59848a786
--- /dev/null
+++ b/testsuite/tests/backtrace/backtrace-b.t
@@ -0,0 +1,15 @@
+#########################################################################
+#                                                                       #
+#                                 OCaml                                 #
+#                                                                       #
+#                 Damien Doligez, Jane Street Capital                   #
+#                                                                       #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
+#   en Automatique.  All rights reserved.  This file is distributed     #
+#   under the terms of the Q Public License version 1.0.                #
+#                                                                       #
+#########################################################################
+
+. backtrace-common.sh
+Targs=b
+Texit=2
diff --git a/testsuite/tests/backtrace/backtrace-c.t b/testsuite/tests/backtrace/backtrace-c.t
new file mode 100644
index 0000000000..b76a25f45f
--- /dev/null
+++ b/testsuite/tests/backtrace/backtrace-c.t
@@ -0,0 +1,15 @@
+#########################################################################
+#                                                                       #
+#                                 OCaml                                 #
+#                                                                       #
+#                 Damien Doligez, Jane Street Capital                   #
+#                                                                       #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
+#   en Automatique.  All rights reserved.  This file is distributed     #
+#   under the terms of the Q Public License version 1.0.                #
+#                                                                       #
+#########################################################################
+
+. backtrace-common.sh
+Targs=c
+Texit=2
diff --git a/testsuite/tests/backtrace/backtrace-common.sh b/testsuite/tests/backtrace/backtrace-common.sh
new file mode 100644
index 0000000000..17b18b8ecf
--- /dev/null
+++ b/testsuite/tests/backtrace/backtrace-common.sh
@@ -0,0 +1,15 @@
+#########################################################################
+#                                                                       #
+#                                 OCaml                                 #
+#                                                                       #
+#                 Damien Doligez, Jane Street Capital                   #
+#                                                                       #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
+#   en Automatique.  All rights reserved.  This file is distributed     #
+#   under the terms of the Q Public License version 1.0.                #
+#                                                                       #
+#########################################################################
+
+. Testcommon.sh
+Tml_files=backtrace.ml
+Ttests='Tbyte_compile_run Topt_compile_run'
diff --git a/testsuite/tests/backtrace/backtrace-d.t b/testsuite/tests/backtrace/backtrace-d.t
new file mode 100644
index 0000000000..fb534e449f
--- /dev/null
+++ b/testsuite/tests/backtrace/backtrace-d.t
@@ -0,0 +1,15 @@
+#########################################################################
+#                                                                       #
+#                                 OCaml                                 #
+#                                                                       #
+#                 Damien Doligez, Jane Street Capital                   #
+#                                                                       #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
+#   en Automatique.  All rights reserved.  This file is distributed     #
+#   under the terms of the Q Public License version 1.0.                #
+#                                                                       #
+#########################################################################
+
+. backtrace-common.sh
+Targs=d
+Texit=2
diff --git a/testsuite/tests/backtrace/backtrace-none.t b/testsuite/tests/backtrace/backtrace-none.t
new file mode 100644
index 0000000000..4b37bb02bd
--- /dev/null
+++ b/testsuite/tests/backtrace/backtrace-none.t
@@ -0,0 +1,15 @@
+#########################################################################
+#                                                                       #
+#                                 OCaml                                 #
+#                                                                       #
+#                 Damien Doligez, Jane Street Capital                   #
+#                                                                       #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
+#   en Automatique.  All rights reserved.  This file is distributed     #
+#   under the terms of the Q Public License version 1.0.                #
+#                                                                       #
+#########################################################################
+
+. backtrace-common.sh
+Targs=
+Texit=2
diff --git a/testsuite/tests/backtrace/backtrace2.t b/testsuite/tests/backtrace/backtrace2.t
index 63a2bf8893..4231d077d0 100644
--- a/testsuite/tests/backtrace/backtrace2.t
+++ b/testsuite/tests/backtrace/backtrace2.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/backtrace/backtrace_deprecated.t b/testsuite/tests/backtrace/backtrace_deprecated.t
index 63a2bf8893..4231d077d0 100644
--- a/testsuite/tests/backtrace/backtrace_deprecated.t
+++ b/testsuite/tests/backtrace/backtrace_deprecated.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/backtrace/backtrace_slots.t b/testsuite/tests/backtrace/backtrace_slots.t
index 63a2bf8893..4231d077d0 100644
--- a/testsuite/tests/backtrace/backtrace_slots.t
+++ b/testsuite/tests/backtrace/backtrace_slots.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/backtrace/backtraces_and_finalizers.t b/testsuite/tests/backtrace/backtraces_and_finalizers.t
index a0e95d7015..b4b5f79904 100644
--- a/testsuite/tests/backtrace/backtraces_and_finalizers.t
+++ b/testsuite/tests/backtrace/backtraces_and_finalizers.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/backtrace/raw_backtrace.t b/testsuite/tests/backtrace/raw_backtrace.t
index 63a2bf8893..4231d077d0 100644
--- a/testsuite/tests/backtrace/raw_backtrace.t
+++ b/testsuite/tests/backtrace/raw_backtrace.t
@@ -2,9 +2,9 @@
 #                                                                       #
 #                                 OCaml                                 #
 #                                                                       #
-#                 Xavier Clerc, SED, INRIA Rocquencourt                 #
+#                 Damien Doligez, Jane Street Capital                   #
 #                                                                       #
-#   Copyright 2010 Institut National de Recherche en Informatique et    #
+#   Copyright 2015 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
 #   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
diff --git a/testsuite/tests/basic-float/.ignore b/testsuite/tests/basic-float/.ignore
index 6ab4e50f53..1c119b608d 100644
--- a/testsuite/tests/basic-float/.ignore
+++ b/testsuite/tests/basic-float/.ignore
@@ -1 +1,2 @@
 *.tmp_*
+*.byt
diff --git a/testsuite/tests/basic/.ignore b/testsuite/tests/basic/.ignore
index 1e1994454a..ee64803c26 100644
--- a/testsuite/tests/basic/.ignore
+++ b/testsuite/tests/basic/.ignore
@@ -1,2 +1,3 @@
 *.tmp_*
 *.exe
+*.byt