[Git][ghc/ghc][wip/angerman/cross-test-suite] 2 commits: Fix T10955dyn?

[Moritz Angermann]

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


Commits:
4c242580 by Moritz Angermann at 2020-07-20T01:59:06+00:00
Fix T10955dyn?

- - - - -
8c0f7459 by Moritz Angermann at 2020-07-20T02:01:58+00:00
cleanup

- - - - -


3 changed files:

- testsuite/tests/ghci/linking/dyn/Makefile
- − testsuite/tests/ghci/linking/dyn/T10955dyn.stderr
- − testsuite/tests/ghci/linking/dyn/load_short_name.stderr


Changes:

=====================================
testsuite/tests/ghci/linking/dyn/Makefile
=====================================
@@ -24,7 +24,7 @@ else
 CFLAGS = -fPIC
 endif
 
-MY_TEST_HC_OPTS = $(TEST_HC_OPTS) $(CFLAGS)
+MY_TEST_HC_OPTS = $(filter-out -rtsopts,$(TEST_HC_OPTS)) $(CFLAGS)
 
 # --------------------------------------------------------------
 # Note: libAS.def is not used directly in these tests but is
@@ -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)
+	'$(TEST_WRAPPER)' LD_LIBRARY_PATH=./bin_dyn ./bin_dyn/$(call EXE,T10955dyn)
 
 .PHONY: compile_libAS_impl_gcc
 compile_libAS_impl_gcc:


=====================================
testsuite/tests/ghci/linking/dyn/T10955dyn.stderr deleted
=====================================
@@ -1,4 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.


=====================================
testsuite/tests/ghci/linking/dyn/load_short_name.stderr deleted
=====================================
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/41e6465e2197f628287794f23ae950f1597a8480...8c0f74595cbb6736a934404f3b90b509b229d16a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/41e6465e2197f628287794f23ae950f1597a8480...8c0f74595cbb6736a934404f3b90b509b229d16a
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/20200719/8f842f9a/attachment-0001.html>