diff options
Diffstat (limited to 'testsuite/tests/lib-unix')
34 files changed, 372 insertions, 294 deletions
diff --git a/testsuite/tests/lib-unix/common/channel_of.ml b/testsuite/tests/lib-unix/common/channel_of.ml index fb9f294d61..bbb4c6ef17 100644 --- a/testsuite/tests/lib-unix/common/channel_of.ml +++ b/testsuite/tests/lib-unix/common/channel_of.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) open Printf diff --git a/testsuite/tests/lib-unix/common/cloexec.ml b/testsuite/tests/lib-unix/common/cloexec.ml index cb919eb564..9723a778e4 100644 --- a/testsuite/tests/lib-unix/common/cloexec.ml +++ b/testsuite/tests/lib-unix/common/cloexec.ml @@ -1,48 +1,47 @@ (* TEST + include unix; + readonly_files = "fdstatus_aux.c fdstatus_main.ml"; + (* + This test is temporarily disabled on the MinGW and MSVC ports, + because since fdstatus has been wrapped in an OCaml program, + it does not work as well as before. + Presumably this is because the OCaml runtime opens files, so that handles + that have actually been closed at execution look open and make the + test fail. -(* - This test is temporarily disabled on the MinGW and MSVC ports, - because since fdstatus has been wrapped in an OCaml program, - it does not work as well as before. - Presumably this is because the OCaml runtime opens files, so that handles - that have actually been closed at execution look open and make the - test fail. - - One possible fix for this would be to make it possible for ocamltest to - compile C-only programs, which will be a bit of work to handle the - output of msvc and will also duplicate what the OCaml compiler itself - already does. -*) - -* hasunix -include unix -readonly_files = "fdstatus_aux.c fdstatus_main.ml" - -** libunix -*** setup-ocamlc.byte-build-env -program = "${test_build_directory}/cloexec.byte" -**** ocamlc.byte -program = "${test_build_directory}/fdstatus.exe" -all_modules = "fdstatus_aux.c fdstatus_main.ml" -***** ocamlc.byte -program = "${test_build_directory}/cloexec.byte" -all_modules= "cloexec.ml" -****** check-ocamlc.byte-output -******* run -******** check-program-output - -*** setup-ocamlopt.byte-build-env -program = "${test_build_directory}/cloexec.opt" -**** ocamlopt.byte -program = "${test_build_directory}/fdstatus.exe" -all_modules = "fdstatus_aux.c fdstatus_main.ml" -***** ocamlopt.byte -program = "${test_build_directory}/cloexec.opt" -all_modules= "cloexec.ml" -****** check-ocamlopt.byte-output -******* run -******** check-program-output + One possible fix for this would be to make it possible for ocamltest to + compile C-only programs, which will be a bit of work to handle the + output of msvc and will also duplicate what the OCaml compiler itself + already does. + *) + hasunix; + libunix; + { + program = "${test_build_directory}/cloexec.byte"; + setup-ocamlc.byte-build-env; + program = "${test_build_directory}/fdstatus.exe"; + all_modules = "fdstatus_aux.c fdstatus_main.ml"; + ocamlc.byte; + program = "${test_build_directory}/cloexec.byte"; + all_modules = "cloexec.ml"; + ocamlc.byte; + check-ocamlc.byte-output; + run; + check-program-output; + }{ + program = "${test_build_directory}/cloexec.opt"; + setup-ocamlopt.byte-build-env; + program = "${test_build_directory}/fdstatus.exe"; + all_modules = "fdstatus_aux.c fdstatus_main.ml"; + ocamlopt.byte; + program = "${test_build_directory}/cloexec.opt"; + all_modules = "cloexec.ml"; + ocamlopt.byte; + check-ocamlopt.byte-output; + run; + check-program-output; + } *) (* This is a terrible hack that plays on the internal representation diff --git a/testsuite/tests/lib-unix/common/dup.ml b/testsuite/tests/lib-unix/common/dup.ml index b689137c0b..2ca20cba53 100644 --- a/testsuite/tests/lib-unix/common/dup.ml +++ b/testsuite/tests/lib-unix/common/dup.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) let _ = diff --git a/testsuite/tests/lib-unix/common/dup2.ml b/testsuite/tests/lib-unix/common/dup2.ml index c3a7faccda..84f3f92030 100644 --- a/testsuite/tests/lib-unix/common/dup2.ml +++ b/testsuite/tests/lib-unix/common/dup2.ml @@ -1,9 +1,12 @@ (* TEST -* hasunix -include unix -stderr = "/dev/null" -** bytecode -** native + include unix; + stderr = "/dev/null"; + hasunix; + { + bytecode; + }{ + native; + } *) let cat file = diff --git a/testsuite/tests/lib-unix/common/fork_cleanup.ml b/testsuite/tests/lib-unix/common/fork_cleanup.ml index eca8f9de9d..0206c01b03 100644 --- a/testsuite/tests/lib-unix/common/fork_cleanup.ml +++ b/testsuite/tests/lib-unix/common/fork_cleanup.ml @@ -1,9 +1,12 @@ (* TEST -* hasunix -include unix -** not-windows -*** bytecode -*** native + include unix; + hasunix; + not-windows; + { + bytecode; + }{ + native; + } *) (* this test checks that the domain lock is properly reinitialized diff --git a/testsuite/tests/lib-unix/common/fork_cleanup_systhreads.ml b/testsuite/tests/lib-unix/common/fork_cleanup_systhreads.ml index db0ebf4f6d..a25f217b97 100644 --- a/testsuite/tests/lib-unix/common/fork_cleanup_systhreads.ml +++ b/testsuite/tests/lib-unix/common/fork_cleanup_systhreads.ml @@ -1,9 +1,12 @@ (* TEST -* hassysthreads -include systhreads -** not-windows -*** bytecode -*** native + include systhreads; + hassysthreads; + not-windows; + { + bytecode; + }{ + native; + } *) (* this test checks that the domain lock is properly reinitialized diff --git a/testsuite/tests/lib-unix/common/getaddrinfo.ml b/testsuite/tests/lib-unix/common/getaddrinfo.ml index b140ef9143..4c5b88d51f 100644 --- a/testsuite/tests/lib-unix/common/getaddrinfo.ml +++ b/testsuite/tests/lib-unix/common/getaddrinfo.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) let () = diff --git a/testsuite/tests/lib-unix/common/gethostbyaddr.ml b/testsuite/tests/lib-unix/common/gethostbyaddr.ml index a8ea1cf8d4..e9d4b53a5c 100644 --- a/testsuite/tests/lib-unix/common/gethostbyaddr.ml +++ b/testsuite/tests/lib-unix/common/gethostbyaddr.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) (* Checks that gethostbyaddr supports both IPv4 and IPv6 (see #11461) *) diff --git a/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml b/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml index 077a3dba66..1f0f57a183 100644 --- a/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml +++ b/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml @@ -1,9 +1,12 @@ (* TEST -include unix -* hasunix -** not-windows -*** bytecode -*** native + include unix; + hasunix; + not-windows; + { + bytecode; + }{ + native; + } *) (* on Multicore, fork is not allowed is another domain is, and was running. *) diff --git a/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml b/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml index 929ed5ecf7..79b9d6c253 100644 --- a/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml +++ b/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml @@ -1,9 +1,12 @@ (* TEST -include unix -* hasunix -** not-windows -*** bytecode -*** native + include unix; + hasunix; + not-windows; + { + bytecode; + }{ + native; + } *) (* on Multicore, fork is not allowed is another domain is, and was running. *) diff --git a/testsuite/tests/lib-unix/common/pipe_eof.ml b/testsuite/tests/lib-unix/common/pipe_eof.ml index 3bd6ae5f1a..415107da05 100644 --- a/testsuite/tests/lib-unix/common/pipe_eof.ml +++ b/testsuite/tests/lib-unix/common/pipe_eof.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) let drain pipe = diff --git a/testsuite/tests/lib-unix/common/process_pid.ml b/testsuite/tests/lib-unix/common/process_pid.ml index 8d8852f6d4..f2c25f4666 100644 --- a/testsuite/tests/lib-unix/common/process_pid.ml +++ b/testsuite/tests/lib-unix/common/process_pid.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) let () = diff --git a/testsuite/tests/lib-unix/common/redirections.ml b/testsuite/tests/lib-unix/common/redirections.ml index b9c04a2323..fb008a3826 100644 --- a/testsuite/tests/lib-unix/common/redirections.ml +++ b/testsuite/tests/lib-unix/common/redirections.ml @@ -1,35 +1,34 @@ (* TEST - -readonly_files = "reflector.ml" -unset XVAR - -* hasunix -** setup-ocamlc.byte-build-env -program = "${test_build_directory}/redirections.byte" -*** ocamlc.byte -program = "${test_build_directory}/reflector.exe" -all_modules = "reflector.ml" -**** ocamlc.byte -include unix -program = "${test_build_directory}/redirections.byte" -all_modules= "redirections.ml" -***** check-ocamlc.byte-output -****** run -******* check-program-output - -** setup-ocamlopt.byte-build-env -program = "${test_build_directory}/redirections.opt" -*** ocamlopt.byte -program = "${test_build_directory}/reflector.exe" -all_modules = "reflector.ml" -**** ocamlopt.byte -include unix -program = "${test_build_directory}/redirections.opt" -all_modules= "redirections.ml" -***** check-ocamlopt.byte-output -****** run -******* check-program-output - + readonly_files = "reflector.ml"; + unset XVAR; + hasunix; + { + program = "${test_build_directory}/redirections.byte"; + setup-ocamlc.byte-build-env; + program = "${test_build_directory}/reflector.exe"; + all_modules = "reflector.ml"; + ocamlc.byte; + include unix; + program = "${test_build_directory}/redirections.byte"; + all_modules = "redirections.ml"; + ocamlc.byte; + check-ocamlc.byte-output; + run; + check-program-output; + }{ + program = "${test_build_directory}/redirections.opt"; + setup-ocamlopt.byte-build-env; + program = "${test_build_directory}/reflector.exe"; + all_modules = "reflector.ml"; + ocamlopt.byte; + include unix; + program = "${test_build_directory}/redirections.opt"; + all_modules = "redirections.ml"; + ocamlopt.byte; + check-ocamlopt.byte-output; + run; + check-program-output; + } *) diff --git a/testsuite/tests/lib-unix/common/rename.ml b/testsuite/tests/lib-unix/common/rename.ml index 402ddf0bd3..4a88eaa3f0 100644 --- a/testsuite/tests/lib-unix/common/rename.ml +++ b/testsuite/tests/lib-unix/common/rename.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) (* Test the Unix.rename function *) diff --git a/testsuite/tests/lib-unix/common/test_unix_cmdline.ml b/testsuite/tests/lib-unix/common/test_unix_cmdline.ml index 08af41e29a..aff235bd3f 100644 --- a/testsuite/tests/lib-unix/common/test_unix_cmdline.ml +++ b/testsuite/tests/lib-unix/common/test_unix_cmdline.ml @@ -1,34 +1,33 @@ (* TEST - -readonly_files = "cmdline_prog.ml" - -* hasunix -** setup-ocamlc.byte-build-env -program = "${test_build_directory}/test_unix_cmdline.byte" -*** ocamlc.byte -program = "${test_build_directory}/cmdline_prog.exe" -all_modules = "cmdline_prog.ml" -**** ocamlc.byte -include unix -program = "${test_build_directory}/test_unix_cmdline.byte" -all_modules= "test_unix_cmdline.ml" -***** check-ocamlc.byte-output -****** run -******* check-program-output - -** setup-ocamlopt.byte-build-env -program = "${test_build_directory}/test_unix_cmdline.opt" -*** ocamlc.byte -program = "${test_build_directory}/cmdline_prog.exe" -all_modules = "cmdline_prog.ml" -**** ocamlopt.byte -include unix -program = "${test_build_directory}/test_unix_cmdline.opt" -all_modules= "test_unix_cmdline.ml" -***** check-ocamlopt.byte-output -****** run -******* check-program-output - + readonly_files = "cmdline_prog.ml"; + hasunix; + { + program = "${test_build_directory}/test_unix_cmdline.byte"; + setup-ocamlc.byte-build-env; + program = "${test_build_directory}/cmdline_prog.exe"; + all_modules = "cmdline_prog.ml"; + ocamlc.byte; + include unix; + program = "${test_build_directory}/test_unix_cmdline.byte"; + all_modules = "test_unix_cmdline.ml"; + ocamlc.byte; + check-ocamlc.byte-output; + run; + check-program-output; + }{ + program = "${test_build_directory}/test_unix_cmdline.opt"; + setup-ocamlopt.byte-build-env; + program = "${test_build_directory}/cmdline_prog.exe"; + all_modules = "cmdline_prog.ml"; + ocamlc.byte; + include unix; + program = "${test_build_directory}/test_unix_cmdline.opt"; + all_modules = "test_unix_cmdline.ml"; + ocamlopt.byte; + check-ocamlopt.byte-output; + run; + check-program-output; + } *) let prog_name = "cmdline_prog.exe" diff --git a/testsuite/tests/lib-unix/common/test_unixlabels.ml b/testsuite/tests/lib-unix/common/test_unixlabels.ml index fc0335b5f8..c34196fbc0 100644 --- a/testsuite/tests/lib-unix/common/test_unixlabels.ml +++ b/testsuite/tests/lib-unix/common/test_unixlabels.ml @@ -1,9 +1,12 @@ (* TEST -include unix -flags += " -nolabels " -* hasunix -** bytecode -** native + include unix; + flags += " -nolabels "; + hasunix; + { + bytecode; + }{ + native; + } *) module U : module type of Unix = UnixLabels diff --git a/testsuite/tests/lib-unix/common/truncate.ml b/testsuite/tests/lib-unix/common/truncate.ml index a91cabcbb1..50998367d8 100644 --- a/testsuite/tests/lib-unix/common/truncate.ml +++ b/testsuite/tests/lib-unix/common/truncate.ml @@ -1,8 +1,11 @@ (* TEST -include unix -* hasunix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) let str = "Hello, OCaml!" diff --git a/testsuite/tests/lib-unix/common/uexit.ml b/testsuite/tests/lib-unix/common/uexit.ml index b80f32087c..50ec1aa9ca 100644 --- a/testsuite/tests/lib-unix/common/uexit.ml +++ b/testsuite/tests/lib-unix/common/uexit.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) let _ = diff --git a/testsuite/tests/lib-unix/common/utimes.ml b/testsuite/tests/lib-unix/common/utimes.ml index 58aecb6ed2..644579e262 100644 --- a/testsuite/tests/lib-unix/common/utimes.ml +++ b/testsuite/tests/lib-unix/common/utimes.ml @@ -1,9 +1,12 @@ (* TEST -* hasunix -include unix -readonly_files = "utimes.txt" -** bytecode -** native + include unix; + readonly_files = "utimes.txt"; + hasunix; + { + bytecode; + }{ + native; + } *) (* We do not check setting the "last access time" because it is hard to do so on diff --git a/testsuite/tests/lib-unix/common/wait_nohang.ml b/testsuite/tests/lib-unix/common/wait_nohang.ml index fb4c0b259e..bddd61a507 100644 --- a/testsuite/tests/lib-unix/common/wait_nohang.ml +++ b/testsuite/tests/lib-unix/common/wait_nohang.ml @@ -1,34 +1,33 @@ (* TEST - -readonly_files = "reflector.ml" - -* hasunix -** setup-ocamlc.byte-build-env -program = "${test_build_directory}/wait_nohang.byte" -*** ocamlc.byte -program = "${test_build_directory}/reflector.exe" -all_modules = "reflector.ml" -**** ocamlc.byte -include unix -program = "${test_build_directory}/wait_nohang.byte" -all_modules= "wait_nohang.ml" -***** check-ocamlc.byte-output -****** run -******* check-program-output - -** setup-ocamlopt.byte-build-env -program = "${test_build_directory}/wait_nohang.opt" -*** ocamlopt.byte -program = "${test_build_directory}/reflector.exe" -all_modules = "reflector.ml" -**** ocamlopt.byte -include unix -program = "${test_build_directory}/wait_nohang.opt" -all_modules= "wait_nohang.ml" -***** check-ocamlopt.byte-output -****** run -******* check-program-output - + readonly_files = "reflector.ml"; + hasunix; + { + program = "${test_build_directory}/wait_nohang.byte"; + setup-ocamlc.byte-build-env; + program = "${test_build_directory}/reflector.exe"; + all_modules = "reflector.ml"; + ocamlc.byte; + include unix; + program = "${test_build_directory}/wait_nohang.byte"; + all_modules = "wait_nohang.ml"; + ocamlc.byte; + check-ocamlc.byte-output; + run; + check-program-output; + }{ + program = "${test_build_directory}/wait_nohang.opt"; + setup-ocamlopt.byte-build-env; + program = "${test_build_directory}/reflector.exe"; + all_modules = "reflector.ml"; + ocamlopt.byte; + include unix; + program = "${test_build_directory}/wait_nohang.opt"; + all_modules = "wait_nohang.ml"; + ocamlopt.byte; + check-ocamlopt.byte-output; + run; + check-program-output; + } *) let refl = diff --git a/testsuite/tests/lib-unix/isatty/isatty_std.ml b/testsuite/tests/lib-unix/isatty/isatty_std.ml index 1dcff45317..3ce2759300 100644 --- a/testsuite/tests/lib-unix/isatty/isatty_std.ml +++ b/testsuite/tests/lib-unix/isatty/isatty_std.ml @@ -1,10 +1,13 @@ (* TEST -* hasunix -include unix -stdin = "/dev/null" -stderr = "/dev/null" -** bytecode -** native + include unix; + stdin = "/dev/null"; + stderr = "/dev/null"; + hasunix; + { + bytecode; + }{ + native; + } *) Printf.printf diff --git a/testsuite/tests/lib-unix/isatty/isatty_tty.ml b/testsuite/tests/lib-unix/isatty/isatty_tty.ml index df57e7a3ec..aeed2f781f 100644 --- a/testsuite/tests/lib-unix/isatty/isatty_tty.ml +++ b/testsuite/tests/lib-unix/isatty/isatty_tty.ml @@ -1,10 +1,11 @@ (* TEST - -* libwin32unix -include unix -** bytecode -** native - + include unix; + libwin32unix; + { + bytecode; + }{ + native; + } *) let console = diff --git a/testsuite/tests/lib-unix/kill/unix_kill.ml b/testsuite/tests/lib-unix/kill/unix_kill.ml index 2ace3849c3..a58fedacd3 100644 --- a/testsuite/tests/lib-unix/kill/unix_kill.ml +++ b/testsuite/tests/lib-unix/kill/unix_kill.ml @@ -1,8 +1,11 @@ (* TEST -include unix -* libunix -** bytecode -** native + include unix; + libunix; + { + bytecode; + }{ + native; + } *) let () = diff --git a/testsuite/tests/lib-unix/realpath/test.ml b/testsuite/tests/lib-unix/realpath/test.ml index 422c718b49..4ec43cc88d 100644 --- a/testsuite/tests/lib-unix/realpath/test.ml +++ b/testsuite/tests/lib-unix/realpath/test.ml @@ -1,8 +1,11 @@ (* TEST -* hasunix -include unix -** bytecode -** native + include unix; + hasunix; + { + bytecode; + }{ + native; + } *) let main () = diff --git a/testsuite/tests/lib-unix/unix-execvpe/exec.ml b/testsuite/tests/lib-unix/unix-execvpe/exec.ml index 70923d5446..06ec0924cd 100644 --- a/testsuite/tests/lib-unix/unix-execvpe/exec.ml +++ b/testsuite/tests/lib-unix/unix-execvpe/exec.ml @@ -1,11 +1,14 @@ (* TEST - unset FOO - * hasunix - include unix - script = "sh ${test_source_directory}/has-execvpe.sh" - ** script - *** bytecode - *** native + unset FOO; + include unix; + script = "sh ${test_source_directory}/has-execvpe.sh"; + hasunix; + script; + { + bytecode; + }{ + native; + } *) open Printf diff --git a/testsuite/tests/lib-unix/unix-socket/recvfrom_linux.ml b/testsuite/tests/lib-unix/unix-socket/recvfrom_linux.ml index 73fa3fb273..3eaef789e7 100644 --- a/testsuite/tests/lib-unix/unix-socket/recvfrom_linux.ml +++ b/testsuite/tests/lib-unix/unix-socket/recvfrom_linux.ml @@ -1,11 +1,14 @@ (* TEST -include unix -modules = "recvfrom.ml" -script = "sh ${test_source_directory}/is-linux.sh" -* hasunix -** script -*** bytecode -*** native + include unix; + modules = "recvfrom.ml"; + script = "sh ${test_source_directory}/is-linux.sh"; + hasunix; + script; + { + bytecode; + }{ + native; + } *) open Recvfrom diff --git a/testsuite/tests/lib-unix/unix-socket/recvfrom_unix.ml b/testsuite/tests/lib-unix/unix-socket/recvfrom_unix.ml index e584ff17a3..2e31d00df0 100644 --- a/testsuite/tests/lib-unix/unix-socket/recvfrom_unix.ml +++ b/testsuite/tests/lib-unix/unix-socket/recvfrom_unix.ml @@ -1,10 +1,13 @@ (* TEST -include unix -modules = "recvfrom.ml" -* hasunix -** not-windows -*** bytecode -*** native + include unix; + modules = "recvfrom.ml"; + hasunix; + not-windows; + { + bytecode; + }{ + native; + } *) open Recvfrom diff --git a/testsuite/tests/lib-unix/win-channel-of/parallel_channel_of.ml b/testsuite/tests/lib-unix/win-channel-of/parallel_channel_of.ml index 01ae4df1c3..4670a41071 100644 --- a/testsuite/tests/lib-unix/win-channel-of/parallel_channel_of.ml +++ b/testsuite/tests/lib-unix/win-channel-of/parallel_channel_of.ml @@ -1,9 +1,12 @@ (* TEST -modules = "fd_of_channel.c" -* libwin32unix -include unix -** bytecode -** native + modules = "fd_of_channel.c"; + include unix; + libwin32unix; + { + bytecode; + }{ + native; + } *) external fd_of_in_channel: in_channel -> int = "caml_fd_of_channel" diff --git a/testsuite/tests/lib-unix/win-createprocess/test.ml b/testsuite/tests/lib-unix/win-createprocess/test.ml index b72f68cf54..d648f284e2 100644 --- a/testsuite/tests/lib-unix/win-createprocess/test.ml +++ b/testsuite/tests/lib-unix/win-createprocess/test.ml @@ -1,10 +1,11 @@ (* TEST - -* libwin32unix - include unix -** bytecode -** native - + include unix; + libwin32unix; + { + bytecode; + }{ + native; + } *) (* This test is inspired by [Creating a Child Process with Redirected diff --git a/testsuite/tests/lib-unix/win-env/test_env.ml b/testsuite/tests/lib-unix/win-env/test_env.ml index 8f22c4a6f5..3b9ca9a494 100644 --- a/testsuite/tests/lib-unix/win-env/test_env.ml +++ b/testsuite/tests/lib-unix/win-env/test_env.ml @@ -1,12 +1,15 @@ (* TEST -unset FOO -unset FOO2 -include unix -flags += "-strict-sequence -w +A-70 -warn-error +A" -modules = "stubs.c" -* libwin32unix -** bytecode -** native + unset FOO; + unset FOO2; + include unix; + flags += "-strict-sequence -w +A-70 -warn-error +A"; + modules = "stubs.c"; + libwin32unix; + { + bytecode; + }{ + native; + } *) external set_environment_variable: string -> string -> unit diff --git a/testsuite/tests/lib-unix/win-socketpair/test.ml b/testsuite/tests/lib-unix/win-socketpair/test.ml index 8ea703e0c1..cecd4a54c9 100644 --- a/testsuite/tests/lib-unix/win-socketpair/test.ml +++ b/testsuite/tests/lib-unix/win-socketpair/test.ml @@ -1,18 +1,19 @@ (* TEST - -* libwin32unix - script = "sh ${test_source_directory}/has-afunix.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}/has-afunix.sh"; + libwin32unix; + include systhreads; + hassysthreads; + script; + { + output = "${test_build_directory}/program-output"; + stdout = "${output}"; + bytecode; + }{ + output = "${test_build_directory}/program-output"; + stdout = "${output}"; + native; + } +*) let peer id fd = let msg = Bytes.of_string (Printf.sprintf "%d" id) in diff --git a/testsuite/tests/lib-unix/win-stat/test.ml b/testsuite/tests/lib-unix/win-stat/test.ml index 982cf5c48c..a4722e2342 100644 --- a/testsuite/tests/lib-unix/win-stat/test.ml +++ b/testsuite/tests/lib-unix/win-stat/test.ml @@ -1,9 +1,12 @@ (* TEST -modules = "fakeclock.c" -* libwin32unix -include unix -** bytecode -** native + modules = "fakeclock.c"; + include unix; + libwin32unix; + { + bytecode; + }{ + native; + } *) external set_fake_clock : int64 -> unit = "set_fake_clock" diff --git a/testsuite/tests/lib-unix/win-symlink/parallel_symlink.ml b/testsuite/tests/lib-unix/win-symlink/parallel_symlink.ml index d27e7db02d..3d36ad1935 100644 --- a/testsuite/tests/lib-unix/win-symlink/parallel_symlink.ml +++ b/testsuite/tests/lib-unix/win-symlink/parallel_symlink.ml @@ -1,9 +1,12 @@ (* TEST -* libwin32unix -include unix -** has_symlink -*** bytecode -*** native + include unix; + libwin32unix; + has_symlink; + { + bytecode; + }{ + native; + } *) let create_symlink barrier src dst () = diff --git a/testsuite/tests/lib-unix/win-symlink/test.ml b/testsuite/tests/lib-unix/win-symlink/test.ml index d9b9f29e50..72426a23df 100644 --- a/testsuite/tests/lib-unix/win-symlink/test.ml +++ b/testsuite/tests/lib-unix/win-symlink/test.ml @@ -1,11 +1,12 @@ (* TEST - -* libwin32unix - include unix -** has_symlink -*** bytecode -*** native - + include unix; + libwin32unix; + has_symlink; + { + bytecode; + }{ + native; + } *) let link1 = "link1" |