diff options
| author | Richard Eisenberg <rae@cs.brynmawr.edu> | 2018-07-12 16:21:54 -0400 |
|---|---|---|
| committer | Richard Eisenberg <rae@cs.brynmawr.edu> | 2018-07-14 21:23:30 -0400 |
| commit | b7d60022bfcfdeb5e27ba5a0575b2c229b36e21b (patch) | |
| tree | d25c6ecbc2e468910b0c784ff5520b29afce667f /testsuite/tests/safeHaskell | |
| parent | a754a420b53cd2210ef60dcd695bf3334af2e400 (diff) | |
| download | haskell-b7d60022bfcfdeb5e27ba5a0575b2c229b36e21b.tar.gz | |
Make some tests robust against DEBUG compiler
Several tests were failing in DEBUG mode, but fixing this
was easy: just pass $(TEST_HC_OPTS) in the relevant
Makefiles.
Diffstat (limited to 'testsuite/tests/safeHaskell')
| -rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/tests/safeHaskell/check/pkg01/Makefile b/testsuite/tests/safeHaskell/check/pkg01/Makefile index 1c9d8eb596..ed5185d7e5 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/Makefile +++ b/testsuite/tests/safeHaskell/check/pkg01/Makefile @@ -18,7 +18,7 @@ mkPackageDatabase.%: $(MAKE) -s --no-print-directory cleanPackageDatabase.$* mkdir pdb.$* - '$(TEST_HC)' -outputdir pdb.$* -o pdb.$*/setup Setup.hs -v0 + '$(TEST_HC)' $(TEST_HC_OPTS) -outputdir pdb.$* -o pdb.$*/setup Setup.hs -v0 '$(GHC_PKG)' init pdb.$*/local.db # We don't make use of -rtsopts in this test, and if it's enabled then @@ -44,28 +44,28 @@ safePkg01: $(safePkg01_GHC_PKG) field safePkg01-1.0 trusted echo echo 'M_SafePkg' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'M_SafePkg2' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg2.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg2.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'M_SafePkg3' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg3.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg3.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'M_SafePkg4' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg4.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg4.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'M_SafePkg5' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg5.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg5.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'M_SafePkg6' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg6.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg6.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'M_SafePkg7' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg7.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg7.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'M_SafePkg8' - '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg8.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' + '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg8.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:' echo echo 'Testing setting trust' $(safePkg01_GHC_PKG) trust safePkg01-1.0 |