[Git][ghc/ghc][master] ci: Make fat014 test robust

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
1ebd521f by Matthew Pickering at 2022-10-20T16:16:27-04:00
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

- - - - -


2 changed files:

- testsuite/tests/driver/fat-iface/Makefile
- testsuite/tests/driver/fat-iface/all.T


Changes:

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


=====================================
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'])
 
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1ebd521f848289a99993f95af4e2021023537ad5

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1ebd521f848289a99993f95af4e2021023537ad5
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221020/0877b710/attachment-0001.html>