summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2013-04-18 13:55:15 +0000
committerDamien Doligez <damien.doligez-inria.fr>2013-04-18 13:55:15 +0000
commit0125138f56d465debc60b410ddc47ef1c41f7868 (patch)
treecb3fbf84c3457b9aeefc3c21c435a3e6bb91c72f
parent9e2b8f8913ee1b80c981948cfac51dc412bf1d84 (diff)
Under BSD, subshells apparently inherit the -e setting.
In any case, it's better to use "|| true" to suppress an error result. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13561 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--testsuite/tests/runtime-errors/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/tests/runtime-errors/Makefile b/testsuite/tests/runtime-errors/Makefile
index ed08cccba..8c46b199a 100644
--- a/testsuite/tests/runtime-errors/Makefile
+++ b/testsuite/tests/runtime-errors/Makefile
@@ -27,13 +27,13 @@ run:
@ulimit -s 1024; \
for f in *.bytecode; do \
printf " ... testing '$$f':"; \
- (./$$f > $$f.result 2>&1; true); \
+ (./$$f > $$f.result 2>&1 || true); \
$(DIFF) $$f.reference $$f.result > /dev/null || (echo " => failed" &&\
exit 1) && echo " => passed"; \
fn=`basename $$f bytecode`native; \
if [ -z "$(BYTECODE_ONLY)" -a -f "$$fn" ]; then \
printf " ... testing '$$fn':"; \
- (./$$fn > $$fn.result 2>&1; true); \
+ (./$$fn > $$fn.result 2>&1 || true); \
$(DIFF) $$fn.reference $$fn.result > /dev/null || (echo " => failed\
" && exit 1) && echo " => passed"; \
fi; \