diff options
| author | Nicolas Ojeda Bar <n.oje.bar@gmail.com> | 2017-09-27 11:04:43 +0200 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2017-09-27 10:49:30 +0100 |
| commit | 99878e48391664764248534e1f59173feff0955f (patch) | |
| tree | 61aab8f3f4525c4569e29548fd2cf5c3fb569aee | |
| parent | 6a6317a9dafd916c9c85b138105f8bb426dc309e (diff) | |
| download | ocaml-99878e48391664764248534e1f59173feff0955f.tar.gz | |
Simplify exec_tests.precheck
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | testsuite/tests/win-unicode/Makefile | 6 | ||||
| -rw-r--r-- | testsuite/tests/win-unicode/exec_tests.precheck | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 4220b9cd2a..348178dd66 100644 --- a/.gitignore +++ b/.gitignore @@ -352,7 +352,6 @@ _ocamltest /testsuite/tests/warnings/w58.opt.opt_result /testsuite/tests/win-unicode/symlink_tests.precheck -/testsuite/tests/win-unicode/exec_tests.precheck /testsuite/tools/expect_test diff --git a/testsuite/tests/win-unicode/Makefile b/testsuite/tests/win-unicode/Makefile index 2810003a60..bc4adfad95 100644 --- a/testsuite/tests/win-unicode/Makefile +++ b/testsuite/tests/win-unicode/Makefile @@ -9,7 +9,7 @@ C_FILES=mkfiles .PHONY: test test: @if echo 'let () = exit (if Config.windows_unicode then 0 else 1)' | $(OCAML) -I $(OTOPDIR)/utils config.cmo -stdin; then \ - $(MAKE) printargv.exe printenv.exe symlink_tests.precheck exec_tests.precheck && \ + $(MAKE) printargv.exe printenv.exe symlink_tests.precheck && \ $(MAKE) check; \ else \ $(MAKE) SKIP=true C_FILES= run-all; \ @@ -19,10 +19,6 @@ test: symlink_tests.precheck: @echo 'echo "let () = exit (if Unix.has_symlink () then 0 else 1)" | $(OCAML) $(ADD_COMPFLAGS) unix.cma -stdin' > $@ -.PHONY: exec_tests.precheck -exec_tests.precheck: - @echo 'exit 1' > $@ - include $(BASEDIR)/makefiles/Makefile.several include $(BASEDIR)/makefiles/Makefile.common diff --git a/testsuite/tests/win-unicode/exec_tests.precheck b/testsuite/tests/win-unicode/exec_tests.precheck new file mode 100644 index 0000000000..6132b21928 --- /dev/null +++ b/testsuite/tests/win-unicode/exec_tests.precheck @@ -0,0 +1,3 @@ +# exec_tests.ml disabled because it fails non-deterministically (at least under CI) +# seems to be a problem redirecting handles +exit 1 |