Use unset in the testsuite to harden tests

ocaml · Jul 28, 2020 · 209e74b · 209e74b
1 parent e59129e
commit 209e74b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/testsuite/tests/basic/opt_variants.ml b/testsuite/tests/basic/opt_variants.ml
@@ -1,7 +1,9 @@
-(* TEST *)
+(* TEST
+unset DOES_NOT_EXIST
+*)
 
 let () =
-  assert(Sys.getenv_opt "FOOBAR_UNLIKELY_TO_EXIST_42" = None);
+  assert(Sys.getenv_opt "DOES_NOT_EXIST" = None);
 
   assert(int_of_string_opt "foo" = None);
   assert(int_of_string_opt "42" = Some 42);

diff --git a/testsuite/tests/lib-threads/pr7638.ml b/testsuite/tests/lib-threads/pr7638.ml
@@ -1,5 +1,7 @@
 (* TEST
 
+unset FOO
+
 * hassysthreads
 include systhreads
 ** bytecode
@@ -15,5 +17,5 @@ let crashme v =
   | s -> print_string "Surprising but OK\n"
 
 let _ =
-  let th = Thread.create crashme "no such variable" in
+  let th = Thread.create crashme "FOO" in
   Thread.join th
diff --git a/testsuite/tests/lib-unix/common/redirections.ml b/testsuite/tests/lib-unix/common/redirections.ml
@@ -1,6 +1,7 @@
 (* TEST
 
 files = "reflector.ml"
+unset XVAR
 
 * hasunix
 ** setup-ocamlc.byte-build-env

diff --git a/testsuite/tests/lib-unix/unix-execvpe/exec.ml b/testsuite/tests/lib-unix/unix-execvpe/exec.ml
@@ -1,4 +1,5 @@
 (* TEST
+   unset FOO
    * hasunix
    include unix
    script = "sh ${test_source_directory}/has-execvpe.sh"

diff --git a/testsuite/tests/lib-unix/win-env/test_env.ml b/testsuite/tests/lib-unix/win-env/test_env.ml
@@ -1,4 +1,6 @@
 (* TEST
+unset FOO
+unset FOO2
 include unix
 flags += "-strict-sequence -safe-string -w A -warn-error A"
 modules = "stubs.c"

diff --git a/testsuite/tests/output-complete-obj/test2.ml b/testsuite/tests/output-complete-obj/test2.ml
@@ -2,6 +2,7 @@
 
 files = "puts.c"
 use_runtime = "false"
+unset FOO
 
 * hasunix
 include unix