[Git][ghc/ghc][wip/reinstallable-th] tests: work around #24886

Teo Camarasu (@teo) gitlab at gitlab.haskell.org
Sat May 25 10:31:19 UTC 2024



Teo Camarasu pushed to branch wip/reinstallable-th at Glasgow Haskell Compiler / GHC


Commits:
19c7e77b by Teo Camarasu at 2024-05-25T11:31:06+01:00
tests: work around #24886

JS TH linker fails to find modules from template-haskell unless we explicitly specify it using -package

- - - - -


5 changed files:

- testsuite/tests/overloadedrecflds/should_compile/all.T
- testsuite/tests/overloadedrecflds/should_run/all.T
- testsuite/tests/saks/should_compile/all.T
- testsuite/tests/showIface/Makefile
- testsuite/tests/vdq-rta/should_compile/all.T


Changes:

=====================================
testsuite/tests/overloadedrecflds/should_compile/all.T
=====================================
@@ -49,7 +49,7 @@ test('BootFldReexport'
     , ['BootFldReexport', '-v0'])
 test('T23220'
     , [req_th, extra_files(['T23220_aux.hs'])]
-    , multimod_compile, ['T23220_aux.hs T23220.hs', '-v0'])
+    , multimod_compile, ['T23220_aux.hs T23220.hs', '-v0 -package template-haskell'])
 test('T22106_A', [extra_files(['T22106_aux.hs'])], multimod_compile, ['T22106_A', '-v0'])
 test('T22106_B', [extra_files(['T22106_aux.hs'])], multimod_compile, ['T22106_B', '-v0'])
 test('T22106_C', [extra_files(['T22106_aux.hs'])], multimod_compile_fail, ['T22106_C', '-v0'])


=====================================
testsuite/tests/overloadedrecflds/should_run/all.T
=====================================
@@ -3,7 +3,7 @@ test('overloadedrecfldsrun01', [], multimod_compile_and_run,
 test('overloadedrecfldsrun02', [extra_files(['OverloadedRecFldsRun02_A.hs'])], multimod_compile_and_run,
      ['overloadedrecfldsrun02', ''])
 test('overloadedrecfldsrun03', normal, compile_and_run, [''])
-test('overloadedrecfldsrun04', [req_th,omit_ways(prof_ways)], compile_and_run, [''])
+test('overloadedrecfldsrun04', [req_th,omit_ways(prof_ways)], compile_and_run, ['-package template-haskell'])
 test('overloadedrecfldsrun05', normal, compile_and_run, [''])
 test('overloadedrecfldsrun07', normal, compile_and_run, [''])
 test('overloadedrecflds_generics', normal, compile_and_run, [''])


=====================================
testsuite/tests/saks/should_compile/all.T
=====================================
@@ -37,5 +37,5 @@ test('T16721', normal, ghci_script, ['T16721.script'])
 test('T16756a', normal, compile, [''])
 
 test('saks027', req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
-test('saks028', req_th, compile, [''])
+test('saks028', req_th, compile, ['-package template-haskell'])
 test('T17164',  req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques'])


=====================================
testsuite/tests/showIface/Makefile
=====================================
@@ -15,7 +15,7 @@ DocsInHiFile1:
 	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface DocsInHiFile.hi | grep -A 100 'docs:'
 
 DocsInHiFileTH:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -haddock DocsInHiFileTHExternal.hs DocsInHiFileTH.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package template-haskell -c -haddock DocsInHiFileTHExternal.hs DocsInHiFileTH.hs
 	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface DocsInHiFileTH.hi | grep -A 200 'docs:'
 
 NoExportList:


=====================================
testsuite/tests/vdq-rta/should_compile/all.T
=====================================
@@ -26,6 +26,6 @@ test('T24570', normal, compile, [''])
 
 test('T22326_th_dump1', req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
 test('T23739_th_dump1', req_th, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
-test('T22326_th_pprint1', req_th, compile, [''])
-test('T23739_th_pprint1', req_th, compile, [''])
-test('T23738_th', req_th, compile, [''])
\ No newline at end of file
+test('T22326_th_pprint1', req_th, compile, ['-package template-haskell'])
+test('T23739_th_pprint1', req_th, compile, ['-package template-haskell'])
+test('T23738_th', req_th, compile, [''])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/19c7e77b8c9d0f3b002f196b6cacc16d33243b86

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/19c7e77b8c9d0f3b002f196b6cacc16d33243b86
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/20240525/59cd28ea/attachment-0001.html>


More information about the ghc-commits mailing list