diff options
Diffstat (limited to 'testsuite/tests/lib-threads')
21 files changed, 212 insertions, 214 deletions
diff --git a/testsuite/tests/lib-threads/backtrace_threads.ml b/testsuite/tests/lib-threads/backtrace_threads.ml index 3c112d610e..5981c7cb96 100644 --- a/testsuite/tests/lib-threads/backtrace_threads.ml +++ b/testsuite/tests/lib-threads/backtrace_threads.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) let () = Printexc.record_backtrace true diff --git a/testsuite/tests/lib-threads/bank.ml b/testsuite/tests/lib-threads/bank.ml index 0f080ad3e1..e0302ab27e 100644 --- a/testsuite/tests/lib-threads/bank.ml +++ b/testsuite/tests/lib-threads/bank.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) (* The bank account example, using events and channels *) diff --git a/testsuite/tests/lib-threads/beat.ml b/testsuite/tests/lib-threads/beat.ml index 06120ab961..f4655ccb8d 100644 --- a/testsuite/tests/lib-threads/beat.ml +++ b/testsuite/tests/lib-threads/beat.ml @@ -1,12 +1,16 @@ (* TEST - -* hassysthreads -include systhreads -* skip -reason = "off-by-one error on MacOS+Clang (#408)" -** bytecode -** native - + { + include systhreads; + hassysthreads; + }{ + reason = "off-by-one error on MacOS+Clang (#408)"; + skip; + { + bytecode; + }{ + native; + } + } *) (* Test Thread.delay and its scheduling *) diff --git a/testsuite/tests/lib-threads/bufchan.ml b/testsuite/tests/lib-threads/bufchan.ml index df5f3984d7..f188cac8fa 100644 --- a/testsuite/tests/lib-threads/bufchan.ml +++ b/testsuite/tests/lib-threads/bufchan.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) open Event diff --git a/testsuite/tests/lib-threads/close.ml b/testsuite/tests/lib-threads/close.ml index 10f553a6b3..92e252d9e6 100644 --- a/testsuite/tests/lib-threads/close.ml +++ b/testsuite/tests/lib-threads/close.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) let main () = diff --git a/testsuite/tests/lib-threads/delayintr.ml b/testsuite/tests/lib-threads/delayintr.ml index 5fcc20143c..924d3179c4 100644 --- a/testsuite/tests/lib-threads/delayintr.ml +++ b/testsuite/tests/lib-threads/delayintr.ml @@ -1,48 +1,33 @@ (* TEST - -* hassysthreads -include systhreads - -readonly_files = "sigint.c" - -** libunix (* excludes mingw32/64 and msvc32/64 *) - -*** setup-ocamlc.byte-build-env - -program = "${test_build_directory}/delayintr.byte" - -**** ocamlc.byte - -program = "sigint" -all_modules = "sigint.c" - -***** ocamlc.byte - -program = "${test_build_directory}/delayintr.byte" -all_modules = "delayintr.ml" - -****** check-ocamlc.byte-output -******* run -******** check-program-output - -*** setup-ocamlopt.byte-build-env - -program = "${test_build_directory}/delayintr.opt" - -**** ocamlopt.byte - -program = "sigint" -all_modules = "sigint.c" - -***** ocamlopt.byte - -program = "${test_build_directory}/delayintr.opt" -all_modules = "delayintr.ml" - -****** check-ocamlopt.byte-output -******* run -******** check-program-output - + include systhreads; + readonly_files = "sigint.c"; + hassysthreads; + libunix; (* excludes mingw32/64 and msvc32/64 *) + { + program = "${test_build_directory}/delayintr.byte"; + setup-ocamlc.byte-build-env; + program = "sigint"; + all_modules = "sigint.c"; + ocamlc.byte; + program = "${test_build_directory}/delayintr.byte"; + all_modules = "delayintr.ml"; + ocamlc.byte; + check-ocamlc.byte-output; + run; + check-program-output; + }{ + program = "${test_build_directory}/delayintr.opt"; + setup-ocamlopt.byte-build-env; + program = "sigint"; + all_modules = "sigint.c"; + ocamlopt.byte; + program = "${test_build_directory}/delayintr.opt"; + all_modules = "delayintr.ml"; + ocamlopt.byte; + check-ocamlopt.byte-output; + run; + check-program-output; + } *) (* Regression test for MPR#7903 *) diff --git a/testsuite/tests/lib-threads/fileio.ml b/testsuite/tests/lib-threads/fileio.ml index 0e23128d1e..138be2bd1d 100644 --- a/testsuite/tests/lib-threads/fileio.ml +++ b/testsuite/tests/lib-threads/fileio.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) (* Test a file copy function *) diff --git a/testsuite/tests/lib-threads/mutex_errors.ml b/testsuite/tests/lib-threads/mutex_errors.ml index 25d3330955..1cbd6aaf8c 100644 --- a/testsuite/tests/lib-threads/mutex_errors.ml +++ b/testsuite/tests/lib-threads/mutex_errors.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) let log s = diff --git a/testsuite/tests/lib-threads/pr4466.ml b/testsuite/tests/lib-threads/pr4466.ml index 8b53539ded..1e0e36a72c 100644 --- a/testsuite/tests/lib-threads/pr4466.ml +++ b/testsuite/tests/lib-threads/pr4466.ml @@ -1,8 +1,7 @@ (* TEST - -* hassysthreads - include systhreads -** native + include systhreads; + hassysthreads; + native; *) open Printf diff --git a/testsuite/tests/lib-threads/pr5325.ml b/testsuite/tests/lib-threads/pr5325.ml index 9f27f038fd..873d569700 100644 --- a/testsuite/tests/lib-threads/pr5325.ml +++ b/testsuite/tests/lib-threads/pr5325.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) open Printf diff --git a/testsuite/tests/lib-threads/pr7638.ml b/testsuite/tests/lib-threads/pr7638.ml index ea7fabc530..83cd7cf814 100644 --- a/testsuite/tests/lib-threads/pr7638.ml +++ b/testsuite/tests/lib-threads/pr7638.ml @@ -1,12 +1,12 @@ (* TEST - -unset DOES_NOT_EXIST - -* hassysthreads -include systhreads -** bytecode -** native - + unset DOES_NOT_EXIST; + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) (* MPR#7638 repro case *) diff --git a/testsuite/tests/lib-threads/pr8857.ml b/testsuite/tests/lib-threads/pr8857.ml index cc6d53d4c5..1d14b12cae 100644 --- a/testsuite/tests/lib-threads/pr8857.ml +++ b/testsuite/tests/lib-threads/pr8857.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) let _ = diff --git a/testsuite/tests/lib-threads/prodcons.ml b/testsuite/tests/lib-threads/prodcons.ml index 4867ed38d1..8c27984127 100644 --- a/testsuite/tests/lib-threads/prodcons.ml +++ b/testsuite/tests/lib-threads/prodcons.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) (* Classic producer-consumer *) diff --git a/testsuite/tests/lib-threads/prodcons2.ml b/testsuite/tests/lib-threads/prodcons2.ml index 308fcd5151..3fe057c397 100644 --- a/testsuite/tests/lib-threads/prodcons2.ml +++ b/testsuite/tests/lib-threads/prodcons2.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) (* Producer-consumer with events and multiple producers *) diff --git a/testsuite/tests/lib-threads/sieve.ml b/testsuite/tests/lib-threads/sieve.ml index d4cdd447e1..3f8769ff8a 100644 --- a/testsuite/tests/lib-threads/sieve.ml +++ b/testsuite/tests/lib-threads/sieve.ml @@ -1,17 +1,17 @@ (* TEST - -script = "sh ${test_source_directory}/test-runtime-cleanup.sh" - -* hassysthreads -include systhreads -** script -*** bytecode -output = "${test_build_directory}/program-output" -stdout = "${output}" -*** native -output = "${test_build_directory}/program-output" -stdout = "${output}" - + script = "sh ${test_source_directory}/test-runtime-cleanup.sh"; + include systhreads; + hassysthreads; + script; + { + output = "${test_build_directory}/program-output"; + stdout = "${output}"; + bytecode; + }{ + output = "${test_build_directory}/program-output"; + stdout = "${output}"; + native; + } *) (* This test is skipped in "runtime cleanup at exit" mode diff --git a/testsuite/tests/lib-threads/signal.ml b/testsuite/tests/lib-threads/signal.ml index bfc1ea8c30..9073247959 100644 --- a/testsuite/tests/lib-threads/signal.ml +++ b/testsuite/tests/lib-threads/signal.ml @@ -1,48 +1,33 @@ (* TEST - -* hassysthreads -include systhreads - -readonly_files = "sigint.c" - -** libunix (* excludes mingw32/64 and msvc32/64 *) - -*** setup-ocamlc.byte-build-env - -program = "${test_build_directory}/signal.byte" - -**** ocamlc.byte - -program = "sigint" -all_modules = "sigint.c" - -***** ocamlc.byte - -program = "${test_build_directory}/signal.byte" -all_modules = "signal.ml" - -****** check-ocamlc.byte-output -******* run -******** check-program-output - -*** setup-ocamlopt.byte-build-env - -program = "${test_build_directory}/signal.opt" - -**** ocamlopt.byte - -program = "sigint" -all_modules = "sigint.c" - -***** ocamlopt.byte - -program = "${test_build_directory}/signal.opt" -all_modules = "signal.ml" - -****** check-ocamlopt.byte-output -******* run -******** check-program-output - + include systhreads; + readonly_files = "sigint.c"; + hassysthreads; + libunix; (* excludes mingw32/64 and msvc32/64 *) + { + program = "${test_build_directory}/signal.byte"; + setup-ocamlc.byte-build-env; + program = "sigint"; + all_modules = "sigint.c"; + ocamlc.byte; + program = "${test_build_directory}/signal.byte"; + all_modules = "signal.ml"; + ocamlc.byte; + check-ocamlc.byte-output; + run; + check-program-output; + }{ + program = "${test_build_directory}/signal.opt"; + setup-ocamlopt.byte-build-env; + program = "sigint"; + all_modules = "sigint.c"; + ocamlopt.byte; + program = "${test_build_directory}/signal.opt"; + all_modules = "signal.ml"; + ocamlopt.byte; + check-ocamlopt.byte-output; + run; + check-program-output; + } *) let signaled = ref false diff --git a/testsuite/tests/lib-threads/sockets.ml b/testsuite/tests/lib-threads/sockets.ml index c7299c42e7..91e67f7185 100644 --- a/testsuite/tests/lib-threads/sockets.ml +++ b/testsuite/tests/lib-threads/sockets.ml @@ -1,12 +1,12 @@ (* TEST - -* hassysthreads -include systhreads - -** libunix (* Broken on Windows (missing join?), needs to be fixed *) -*** bytecode -*** native - + include systhreads; + hassysthreads; + libunix; (* Broken on Windows (missing join?), needs to be fixed *) + { + bytecode; + }{ + native; + } *) open Printf diff --git a/testsuite/tests/lib-threads/swapchan.ml b/testsuite/tests/lib-threads/swapchan.ml index 3536b82e2e..6c9c3d7714 100644 --- a/testsuite/tests/lib-threads/swapchan.ml +++ b/testsuite/tests/lib-threads/swapchan.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) open Event diff --git a/testsuite/tests/lib-threads/tls.ml b/testsuite/tests/lib-threads/tls.ml index 2741f7ef0b..0aa52792eb 100644 --- a/testsuite/tests/lib-threads/tls.ml +++ b/testsuite/tests/lib-threads/tls.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) let private_data = (Hashtbl.create 17 : (Thread.t, string) Hashtbl.t) diff --git a/testsuite/tests/lib-threads/torture.ml b/testsuite/tests/lib-threads/torture.ml index 16a7811d40..0a5671b0f6 100644 --- a/testsuite/tests/lib-threads/torture.ml +++ b/testsuite/tests/lib-threads/torture.ml @@ -1,10 +1,11 @@ (* TEST - -* hassysthreads -include systhreads -** bytecode -** native - + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } *) (* Torture test - I/O interspersed with lots of GC *) diff --git a/testsuite/tests/lib-threads/uncaught_exception_handler.ml b/testsuite/tests/lib-threads/uncaught_exception_handler.ml index 06cf8f60f0..04de48b589 100644 --- a/testsuite/tests/lib-threads/uncaught_exception_handler.ml +++ b/testsuite/tests/lib-threads/uncaught_exception_handler.ml @@ -1,12 +1,12 @@ -(* TEST +(* TEST_BELOW +(* Blank lines added here to preserve locations. *) + + + + + -flags = "-g" -ocamlrunparam += ",b=1" -* hassysthreads -include systhreads -** bytecode -** native *) @@ -38,3 +38,15 @@ let _ = Thread.set_uncaught_exception_handler (handler Thread.Exit); let th = Thread.create fn () in Thread.join th + +(* TEST + flags = "-g"; + ocamlrunparam += ",b=1"; + include systhreads; + hassysthreads; + { + bytecode; + }{ + native; + } +*) |