diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-10-19 13:06:52 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-10-20 16:16:27 -0400 |
| commit | 1ebd521f848289a99993f95af4e2021023537ad5 (patch) | |
| tree | e1316907cf1a3ca9dccf7303d6efad98519fc560 | |
| parent | ff6f2228bd03be3dd55d0014fd6d2e948a6c9f7c (diff) | |
| download | haskell-1ebd521f848289a99993f95af4e2021023537ad5.tar.gz | |
ci: Make fat014 test robust
For some reason I implemented this as a makefile test rather than a
ghci_script test. Hopefully making it a ghci_script test makes it more
robust.
Fixes #22313
| -rw-r--r-- | testsuite/tests/driver/fat-iface/Makefile | 3 | ||||
| -rw-r--r-- | testsuite/tests/driver/fat-iface/all.T | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/testsuite/tests/driver/fat-iface/Makefile b/testsuite/tests/driver/fat-iface/Makefile index 4c97828f15..703247f139 100644 --- a/testsuite/tests/driver/fat-iface/Makefile +++ b/testsuite/tests/driver/fat-iface/Makefile @@ -49,7 +49,4 @@ fat010: clean echo >> "THB.hs" "$(TEST_HC)" $(TEST_HC_OPTS) THC.hs -fhide-source-paths -fwrite-if-simplfied-core -fprefer-byte-code -fat014: clean - echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -v0 -fno-code < fat014.script - diff --git a/testsuite/tests/driver/fat-iface/all.T b/testsuite/tests/driver/fat-iface/all.T index c4feaaa704..61cd6364bd 100644 --- a/testsuite/tests/driver/fat-iface/all.T +++ b/testsuite/tests/driver/fat-iface/all.T @@ -13,7 +13,7 @@ test('fat012', [unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote. # Check that no objects are generated if using -fno-code and -fprefer-byte-code test('fat013', [extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fno-code -fprefer-byte-code']) # When using interpreter should not produce objects -test('fat014', [extra_files(['FatTH.hs', 'FatQuote.hs'])], makefile_test, ['fat014']) +test('fat014', [extra_files(['FatTH.hs', 'FatQuote.hs']), extra_run_opts('-fno-code')], ghci_script, ['fat014.script']) test('fat015', [unless(ghc_dynamic(), skip), extra_files(['FatQuote.hs', 'FatQuote1.hs', 'FatQuote2.hs', 'FatTH1.hs', 'FatTH2.hs', 'FatTHTop.hs'])], multimod_compile, ['FatTHTop', '-fno-code -fwrite-interface']) |