diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2015-02-16 21:56:02 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2015-02-16 21:56:02 +0000 |
| commit | 956128600fb036aa7793c08fbdc7eab901351821 (patch) | |
| tree | db3fa65e7bbc89b1125b3111bcf507ac40bfb93a /testsuite/tests | |
| parent | 3ff0fd6323c7d88fe1c5f4416f80c7236aa29887 (diff) | |
| download | ocaml-956128600fb036aa7793c08fbdc7eab901351821.tar.gz | |
more cleanup and simplification; more tests
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/new-test-framework@15844 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'testsuite/tests')
39 files changed, 88 insertions, 82 deletions
diff --git a/testsuite/tests/asmcomp/.ignore b/testsuite/tests/asmcomp/.ignore index a6e4efa41d..0c9484bb7e 100644 --- a/testsuite/tests/asmcomp/.ignore +++ b/testsuite/tests/asmcomp/.ignore @@ -5,4 +5,4 @@ lexcmm.ml *.s *.out *.out.dSYM -*.tmp_* +_tmp diff --git a/testsuite/tests/asmcomp/Makefile b/testsuite/tests/asmcomp/Makefile index e47540e19d..f234b6c11d 100644 --- a/testsuite/tests/asmcomp/Makefile +++ b/testsuite/tests/asmcomp/Makefile @@ -47,3 +47,6 @@ power.o: power-$(SYSTEM).o cp power-$(SYSTEM).o power.o arch: $(ARCH).o + +clean: + rm -f ./codegen parsecmm.ml parsecmm.mli lexcmm.ml diff --git a/testsuite/tests/asmcomp/Testcommon.sh b/testsuite/tests/asmcomp/Testcommon.sh index 8f595116b4..38ba4ea2a1 100644 --- a/testsuite/tests/asmcomp/Testcommon.sh +++ b/testsuite/tests/asmcomp/Testcommon.sh @@ -10,9 +10,16 @@ # # ######################################################################### -Topt_compile () { - Pexport_variables - $MAKE all $Pbase.o - $NATIVECC -o $Pbase.exe $cflags $Pbase.o $ARCH.o +kinds=opt + +cbase=$base +opt_comp () { + log $MAKE all $cbase.o + log $NATIVECC -o $opt_exec $cflags $cbase.o $ARCH.o + launch : +} + +clean () { + clean_default + "$MAKE" clean } -Ttests=Topt_compile_run diff --git a/testsuite/tests/asmcomp/arith.t b/testsuite/tests/asmcomp/arith.t index ba847bdf98..4c40574b88 100644 --- a/testsuite/tests/asmcomp/arith.t +++ b/testsuite/tests/asmcomp/arith.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="mainarith.c" -Targs="1 100 3.14159 2.71828" +args="1 100 3.14159 2.71828" diff --git a/testsuite/tests/asmcomp/checkbound.t b/testsuite/tests/asmcomp/checkbound-1.t index 8f3f6f20c4..492b27fb8d 100644 --- a/testsuite/tests/asmcomp/checkbound.t +++ b/testsuite/tests/asmcomp/checkbound-1.t @@ -10,11 +10,7 @@ # # ######################################################################### -. Testcommon.sh - +. ./Testcommon.sh +cbase=checkbound cflags="-DCHECKBOUND main.c" -Ttests=Topt_compile; Tmultiple Topt_run 1 2 -Targs_1="500 1000" -Texit_1=0 -Targs_2="1200 1000" -Texit_2=2 +args="500 1000" diff --git a/testsuite/tests/basic-io-2/Makefile b/testsuite/tests/asmcomp/checkbound-2.t index e810916c93..f8848ba681 100644 --- a/testsuite/tests/basic-io-2/Makefile +++ b/testsuite/tests/asmcomp/checkbound-2.t @@ -2,18 +2,16 @@ # # # 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. # # # ######################################################################### -BASEDIR=../.. -#MODULES= -MAIN_MODULE=io -EXEC_ARGS=io.ml - -include $(BASEDIR)/makefiles/Makefile.one -include $(BASEDIR)/makefiles/Makefile.common +. ./Testcommon.sh +cbase=checkbound +cflags="-DCHECKBOUND main.c" +args="1200 1000" +exit=2 diff --git a/testsuite/tests/asmcomp/fib.t b/testsuite/tests/asmcomp/fib.t index 6d84a0b5ad..c1244d1e65 100644 --- a/testsuite/tests/asmcomp/fib.t +++ b/testsuite/tests/asmcomp/fib.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DINT_INT -DFUN=fib main.c" -Targs=15 +args=15 diff --git a/testsuite/tests/asmcomp/integr.t b/testsuite/tests/asmcomp/integr.t index 493576c9f8..3a0844c2b5 100644 --- a/testsuite/tests/asmcomp/integr.t +++ b/testsuite/tests/asmcomp/integr.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DINT_FLOAT -DFUN=test main.c" -Targs=1000000 +args=1000000 diff --git a/testsuite/tests/asmcomp/optargs.t b/testsuite/tests/asmcomp/optargs.t index f6886a74cb..9239273778 100644 --- a/testsuite/tests/asmcomp/optargs.t +++ b/testsuite/tests/asmcomp/optargs.t @@ -10,4 +10,4 @@ # # ######################################################################### -Ttests=Topt_compile_run +kinds=opt diff --git a/testsuite/tests/asmcomp/quicksort.t b/testsuite/tests/asmcomp/quicksort.t index 48bb429f3d..b18cd7b215 100644 --- a/testsuite/tests/asmcomp/quicksort.t +++ b/testsuite/tests/asmcomp/quicksort.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DSORT -DFUN=quicksort main.c" -Targs=1000000 +args=1000000 diff --git a/testsuite/tests/asmcomp/quicksort2.t b/testsuite/tests/asmcomp/quicksort2.t index 48bb429f3d..b18cd7b215 100644 --- a/testsuite/tests/asmcomp/quicksort2.t +++ b/testsuite/tests/asmcomp/quicksort2.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DSORT -DFUN=quicksort main.c" -Targs=1000000 +args=1000000 diff --git a/testsuite/tests/asmcomp/soli.t b/testsuite/tests/asmcomp/soli.t index e7644f3a63..feacef6c1e 100644 --- a/testsuite/tests/asmcomp/soli.t +++ b/testsuite/tests/asmcomp/soli.t @@ -10,6 +10,6 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DUNIT_INT -DFUN=solitaire main.c" diff --git a/testsuite/tests/asmcomp/staticalloc.t b/testsuite/tests/asmcomp/staticalloc.t index f6886a74cb..9239273778 100644 --- a/testsuite/tests/asmcomp/staticalloc.t +++ b/testsuite/tests/asmcomp/staticalloc.t @@ -10,4 +10,4 @@ # # ######################################################################### -Ttests=Topt_compile_run +kinds=opt diff --git a/testsuite/tests/asmcomp/tagged-fib.t b/testsuite/tests/asmcomp/tagged-fib.t index 778e03068d..9df1d66a06 100644 --- a/testsuite/tests/asmcomp/tagged-fib.t +++ b/testsuite/tests/asmcomp/tagged-fib.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DINT_INT -DFUN=fib main.c" -Targs=31 +args=31 diff --git a/testsuite/tests/asmcomp/tagged-integr.t b/testsuite/tests/asmcomp/tagged-integr.t index 493576c9f8..3a0844c2b5 100644 --- a/testsuite/tests/asmcomp/tagged-integr.t +++ b/testsuite/tests/asmcomp/tagged-integr.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DINT_FLOAT -DFUN=test main.c" -Targs=1000000 +args=1000000 diff --git a/testsuite/tests/asmcomp/tagged-quicksort.t b/testsuite/tests/asmcomp/tagged-quicksort.t index 48bb429f3d..b18cd7b215 100644 --- a/testsuite/tests/asmcomp/tagged-quicksort.t +++ b/testsuite/tests/asmcomp/tagged-quicksort.t @@ -10,7 +10,7 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DSORT -DFUN=quicksort main.c" -Targs=1000000 +args=1000000 diff --git a/testsuite/tests/asmcomp/tagged-tak.t b/testsuite/tests/asmcomp/tagged-tak.t index 898e7e4aca..a46d1f399e 100644 --- a/testsuite/tests/asmcomp/tagged-tak.t +++ b/testsuite/tests/asmcomp/tagged-tak.t @@ -10,6 +10,6 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DUNIT_INT -DFUN=takmain main.c" diff --git a/testsuite/tests/asmcomp/tak.t b/testsuite/tests/asmcomp/tak.t index 898e7e4aca..a46d1f399e 100644 --- a/testsuite/tests/asmcomp/tak.t +++ b/testsuite/tests/asmcomp/tak.t @@ -10,6 +10,6 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh cflags="-DUNIT_INT -DFUN=takmain main.c" diff --git a/testsuite/tests/backtrace/.ignore b/testsuite/tests/backtrace/.ignore index 1c119b608d..6ee5d64f87 100644 --- a/testsuite/tests/backtrace/.ignore +++ b/testsuite/tests/backtrace/.ignore @@ -1,2 +1,3 @@ -*.tmp_* +_tmp *.byt +*.exe diff --git a/testsuite/tests/backtrace/Testcommon.sh b/testsuite/tests/backtrace/Testcommon.sh index bd22780660..9631946628 100644 --- a/testsuite/tests/backtrace/Testcommon.sh +++ b/testsuite/tests/backtrace/Testcommon.sh @@ -10,5 +10,5 @@ # # ######################################################################### -Tcompflags=-g -Texec_env=OCAMLRUNPARAM=b=1 +compflags=-g +exec_env=OCAMLRUNPARAM=b=1 diff --git a/testsuite/tests/backtrace/backtrace-a.t b/testsuite/tests/backtrace/backtrace-a.t index 75cc6ee304..16cd34cbf4 100644 --- a/testsuite/tests/backtrace/backtrace-a.t +++ b/testsuite/tests/backtrace/backtrace-a.t @@ -10,5 +10,5 @@ # # ######################################################################### -. backtrace-common.sh -Targs=a +. ./backtrace-common.sh +args=a diff --git a/testsuite/tests/backtrace/backtrace-b.t b/testsuite/tests/backtrace/backtrace-b.t index b59848a786..a6a55e560d 100644 --- a/testsuite/tests/backtrace/backtrace-b.t +++ b/testsuite/tests/backtrace/backtrace-b.t @@ -10,6 +10,6 @@ # # ######################################################################### -. backtrace-common.sh -Targs=b -Texit=2 +. ./backtrace-common.sh +args=b +exit=2 diff --git a/testsuite/tests/backtrace/backtrace-c.t b/testsuite/tests/backtrace/backtrace-c.t index b76a25f45f..f5efa275c1 100644 --- a/testsuite/tests/backtrace/backtrace-c.t +++ b/testsuite/tests/backtrace/backtrace-c.t @@ -10,6 +10,6 @@ # # ######################################################################### -. backtrace-common.sh -Targs=c -Texit=2 +. ./backtrace-common.sh +args=c +exit=2 diff --git a/testsuite/tests/backtrace/backtrace-common.sh b/testsuite/tests/backtrace/backtrace-common.sh index 17b18b8ecf..daddec0ec5 100644 --- a/testsuite/tests/backtrace/backtrace-common.sh +++ b/testsuite/tests/backtrace/backtrace-common.sh @@ -11,5 +11,5 @@ ######################################################################### . Testcommon.sh -Tml_files=backtrace.ml -Ttests='Tbyte_compile_run Topt_compile_run' +ml_files=backtrace.ml +kinds='byte opt' diff --git a/testsuite/tests/backtrace/backtrace-d.t b/testsuite/tests/backtrace/backtrace-d.t index fb534e449f..8bd81cd21b 100644 --- a/testsuite/tests/backtrace/backtrace-d.t +++ b/testsuite/tests/backtrace/backtrace-d.t @@ -10,6 +10,6 @@ # # ######################################################################### -. backtrace-common.sh -Targs=d -Texit=2 +. ./backtrace-common.sh +args=d +exit=2 diff --git a/testsuite/tests/backtrace/backtrace-none.t b/testsuite/tests/backtrace/backtrace-none.t index 4b37bb02bd..2e60d23434 100644 --- a/testsuite/tests/backtrace/backtrace-none.t +++ b/testsuite/tests/backtrace/backtrace-none.t @@ -10,6 +10,6 @@ # # ######################################################################### -. backtrace-common.sh -Targs= -Texit=2 +. ./backtrace-common.sh +args= +exit=2 diff --git a/testsuite/tests/backtrace/backtrace2.t b/testsuite/tests/backtrace/backtrace2.t index 4231d077d0..33610b956e 100644 --- a/testsuite/tests/backtrace/backtrace2.t +++ b/testsuite/tests/backtrace/backtrace2.t @@ -10,4 +10,4 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh diff --git a/testsuite/tests/backtrace/backtrace_deprecated.t b/testsuite/tests/backtrace/backtrace_deprecated.t index 4231d077d0..33610b956e 100644 --- a/testsuite/tests/backtrace/backtrace_deprecated.t +++ b/testsuite/tests/backtrace/backtrace_deprecated.t @@ -10,4 +10,4 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh diff --git a/testsuite/tests/backtrace/backtrace_slots.t b/testsuite/tests/backtrace/backtrace_slots.t index 4231d077d0..33610b956e 100644 --- a/testsuite/tests/backtrace/backtrace_slots.t +++ b/testsuite/tests/backtrace/backtrace_slots.t @@ -10,4 +10,4 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh diff --git a/testsuite/tests/backtrace/raw_backtrace.t b/testsuite/tests/backtrace/raw_backtrace.t index 4231d077d0..33610b956e 100644 --- a/testsuite/tests/backtrace/raw_backtrace.t +++ b/testsuite/tests/backtrace/raw_backtrace.t @@ -10,4 +10,4 @@ # # ######################################################################### -. Testcommon.sh +. ./Testcommon.sh diff --git a/testsuite/tests/basic-float/.ignore b/testsuite/tests/basic-float/.ignore index 1c119b608d..6ee5d64f87 100644 --- a/testsuite/tests/basic-float/.ignore +++ b/testsuite/tests/basic-float/.ignore @@ -1,2 +1,3 @@ -*.tmp_* +_tmp *.byt +*.exe diff --git a/testsuite/tests/basic-float/tfloat_record.t b/testsuite/tests/basic-float/tfloat_record.t index c8b881850d..bb3cdbc174 100644 --- a/testsuite/tests/basic-float/tfloat_record.t +++ b/testsuite/tests/basic-float/tfloat_record.t @@ -10,5 +10,5 @@ # # ######################################################################### -Tml_files="float_record.ml tfloat_record.ml" -Tmli_files=float_record.mli +ml_files="float_record.ml tfloat_record.ml" +mli_files=float_record.mli diff --git a/testsuite/tests/basic-io-2/.ignore b/testsuite/tests/basic-io-2/.ignore new file mode 100644 index 0000000000..6ee5d64f87 --- /dev/null +++ b/testsuite/tests/basic-io-2/.ignore @@ -0,0 +1,3 @@ +_tmp +*.byt +*.exe diff --git a/testsuite/tests/basic-io-2/io.reference b/testsuite/tests/basic-io-2/io.out index 06740020a7..06740020a7 100644 --- a/testsuite/tests/basic-io-2/io.reference +++ b/testsuite/tests/basic-io-2/io.out diff --git a/testsuite/tests/asmcomp/Testcommon.clean b/testsuite/tests/basic-io-2/io.t index 05580057e2..53a3063461 100644 --- a/testsuite/tests/asmcomp/Testcommon.clean +++ b/testsuite/tests/basic-io-2/io.t @@ -2,12 +2,12 @@ # # # 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. # # # ######################################################################### -rm -f ./codegen parsecmm.ml parsecmm.mli lexcmm.ml +args=io.ml diff --git a/testsuite/tests/basic-io/.ignore b/testsuite/tests/basic-io/.ignore new file mode 100644 index 0000000000..6ee5d64f87 --- /dev/null +++ b/testsuite/tests/basic-io/.ignore @@ -0,0 +1,3 @@ +_tmp +*.byt +*.exe diff --git a/testsuite/tests/basic-io/wc.reference b/testsuite/tests/basic-io/wc.out index adaaa750b4..adaaa750b4 100644 --- a/testsuite/tests/basic-io/wc.reference +++ b/testsuite/tests/basic-io/wc.out diff --git a/testsuite/tests/basic-io/Makefile b/testsuite/tests/basic-io/wc.t index 3f9c10ed9f..44fbb550d9 100644 --- a/testsuite/tests/basic-io/Makefile +++ b/testsuite/tests/basic-io/wc.t @@ -2,18 +2,12 @@ # # # 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. # # # ######################################################################### -BASEDIR=../.. -#MODULES= -MAIN_MODULE=wc -EXEC_ARGS=wc.ml - -include $(BASEDIR)/makefiles/Makefile.one -include $(BASEDIR)/makefiles/Makefile.common +args=wc.ml diff --git a/testsuite/tests/basic/.ignore b/testsuite/tests/basic/.ignore index ee64803c26..63edb1c92e 100644 --- a/testsuite/tests/basic/.ignore +++ b/testsuite/tests/basic/.ignore @@ -1,3 +1,3 @@ -*.tmp_* +_tmp *.exe *.byt |