[Git][ghc/ghc][wip/angerman/cross-test-suite] Disable T10955dyn when cross testing. Can't get the TEST_WRAPPER to work on macOS.

[Moritz Angermann]

Moritz Angermann pushed to branch wip/angerman/cross-test-suite at Glasgow Haskell Compiler / GHC


Commits:
9e305d5e by Moritz Angermann at 2020-07-21T11:49:15+08:00
Disable T10955dyn when cross testing. Can't get the TEST_WRAPPER to work on macOS.

- - - - -


2 changed files:

- testsuite/tests/ghci/linking/dyn/Makefile
- testsuite/tests/ghci/linking/dyn/all.T


Changes:

=====================================
testsuite/tests/ghci/linking/dyn/Makefile
=====================================
@@ -74,7 +74,7 @@ compile_libAB_dyn:
 	'$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_dyn" -shared B.c -o "bin_dyn/$(call DLL,B)" -lA -L"./bin_dyn"
 	rm -f bin_dyn/*.a
 	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -v0 -o "bin_dyn/$(call EXE,T10955dyn)" -L./bin_dyn -lB -lA T10955dyn.hs -v0
-	LD_LIBRARY_PATH=./bin_dyn '$(TEST_WRAPPER)' ./bin_dyn/$(call EXE,T10955dyn)
+	LD_LIBRARY_PATH=./bin_dyn ./bin_dyn/$(call EXE,T10955dyn)
 
 .PHONY: compile_libAS_impl_gcc
 compile_libAS_impl_gcc:


=====================================
testsuite/tests/ghci/linking/dyn/all.T
=====================================
@@ -23,7 +23,10 @@ test('T10955',
       extra_hc_opts('-L. -L./bin_dep')],
      ghci_script, ['T10955.script'])
 
-test('T10955dyn', [extra_files(['A.c', 'B.c'])], makefile_test, ['compile_libAB_dyn'])
+test('T10955dyn',
+     [when(cross(), skip), # can't get this to work properly without sacrificing darwin tests.
+      extra_files(['A.c', 'B.c'])],
+     makefile_test, ['compile_libAB_dyn'])
 
 test('T10458',
      [extra_files(['A.c']),



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9e305d5e37a15caa974db02f9eae5591a4bd15cb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9e305d5e37a15caa974db02f9eae5591a4bd15cb
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/20200720/f21d2224/attachment.html>