diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2015-04-15 19:22:20 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2015-04-15 19:22:20 +0000 |
| commit | ae93e2194d97b41183901e773882bed0439baac5 (patch) | |
| tree | ecdf27c241877f69fac4df555202dda056a5a9a4 | |
| parent | d611d6f3682030dfb7a7ffb2017027b0d447ae0b (diff) | |
| download | ocaml-master.tar.gz | |
extend OCAMLRUNPARAM instead of replacing itmaster
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16021 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/tests/backtrace/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/testsuite/tests/backtrace/Makefile b/testsuite/tests/backtrace/Makefile index 33ca1ed8bc..9e7fec78b9 100644 --- a/testsuite/tests/backtrace/Makefile +++ b/testsuite/tests/backtrace/Makefile @@ -30,7 +30,8 @@ byte: for arg in a b c d ''; do \ printf " ... testing '$$file' with ocamlc and argument '$$arg':"; \ F="`basename $$file .ml`"; \ - (OCAMLRUNPARAM=b=1 $(OCAMLRUN) $(EXECNAME) $$arg || true) \ + (OCAMLRUNPARAM=$$OCAMLRUNPARAM,b=1 \ + $(OCAMLRUN) $(EXECNAME) $$arg || true) \ >$$F.$$arg.byte.result 2>&1; \ $(DIFF) $$F.$$arg.reference $$F.$$arg.byte.result >/dev/null \ && echo " => passed" || echo " => failed"; \ @@ -41,7 +42,8 @@ byte: $(OCAMLC) -g -o $(EXECNAME) $$file; \ printf " ... testing '$$file' with ocamlc:"; \ F="`basename $$file .ml`"; \ - (OCAMLRUNPARAM=b=1 $(OCAMLRUN) $(EXECNAME) $$arg || true) \ + (OCAMLRUNPARAM=$$OCAMLRUNPARAM,b=1 \ + $(OCAMLRUN) $(EXECNAME) $$arg || true) \ >$$F.byte.result 2>&1; \ $(DIFF) $$F.reference $$F.byte.result >/dev/null \ && echo " => passed" || echo " => failed"; \ @@ -55,7 +57,8 @@ native: for arg in a b c d ''; do \ printf " ... testing '$$file' with ocamlopt and argument '$$arg':"; \ F="`basename $$file .ml`"; \ - (OCAMLRUNPARAM=b=1 ./$(EXECNAME) $$arg || true) \ + (OCAMLRUNPARAM=$$OCAMLRUNPARAM,b=1 \ + ./$(EXECNAME) $$arg || true) \ >$$F.$$arg.native.result 2>&1; \ $(DIFF) $$F.$$arg.reference $$F.$$arg.native.result >/dev/null \ && echo " => passed" || echo " => failed"; \ @@ -66,7 +69,8 @@ native: $(OCAMLOPT) -g -o $(EXECNAME) $$file; \ printf " ... testing '$$file' with ocamlopt:"; \ F="`basename $$file .ml`"; \ - (OCAMLRUNPARAM=b=1 ./$(EXECNAME) $$arg || true) \ + (OCAMLRUNPARAM=$OCAMLRUNPARAM,b=1 \ + ./$(EXECNAME) $$arg || true) \ >$$F.native.result 2>&1; \ $(DIFF) $$F.reference $$F.native.result >/dev/null \ && echo " => passed" || echo " => failed"; \ @@ -76,7 +80,8 @@ native: $(OCAMLOPT) -inline 0 -g -o $(EXECNAME) $$file; \ printf " ... testing '$$file' with ocamlopt:"; \ F="`basename $$file .ml`"; \ - (OCAMLRUNPARAM=b=1 ./$(EXECNAME) $$arg || true) \ + (OCAMLRUNPARAM=$$OCAMLRUNPARAM,b=1 \ + ./$(EXECNAME) $$arg || true) \ >$$F.native.result 2>&1; \ $(DIFF) $$F.reference $$F.native.result >/dev/null \ && echo " => passed" || echo " => failed"; \ |