Simplify exec_tests.precheck

master
Nicolas Ojeda Bar 2017-09-27 11:04:43 +02:00 committed by David Allsopp
parent 6a6317a9da
commit 99878e4839
3 changed files with 4 additions and 6 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -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