[Git][ghc/ghc][wip/foreign-libs-test] fix test

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/foreign-libs-test at Glasgow Haskell Compiler / GHC


Commits:
31f9b6ea by Matthew Pickering at 2023-11-15T09:35:42+00:00
fix test

- - - - -


2 changed files:

- testsuite/tests/driver/Makefile
- − testsuite/tests/driver/driver016a.stderr


Changes:

=====================================
testsuite/tests/driver/Makefile
=====================================
@@ -65,11 +65,10 @@ test016:
 	test -f F016_stub.h
 
 testForeignExportSharedLibrary:
-	$(RM) F016.hi F016$(dllext)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -shared -dynamic -fPIC F016.hs -flink-rts -o libfoo$(dllext)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -dynamic -no-hs-main f016.c -lfoo -L.
-	"$(TEST_HC)" $(TEST_HC_OPTS) -dynamic -no-hs-main f016.o -lfoo -L. -optl-Wl,-rpath,'$ORIGIN' -o f016$(exeext)
-	./f016$(exeext)
+	$(RM) F016.hi libfoo$(dllext) f016$(exeext)
+	"$(TEST_HC)"  $(filter-out -rtsopts, $(TEST_HC_OPTS)) -shared -dynamic -fPIC F016.hs -flink-rts -o libfoo$(dllext)
+	LD_LIBRARY_PATH=".:$(LD_LIBRARY_PATH)" "$(TEST_HC)" $(filter-out -rtsopts, $(TEST_HC_OPTS)) -dynamic -no-hs-main f016.c -lfoo -o f016$(exeext)
+	LD_LIBRARY_PATH=".:$(LD_LIBRARY_PATH)"  ./f016$(exeext)
 
 # test -stubdir (filename differs from module name)
 test017:


=====================================
testsuite/tests/driver/driver016a.stderr deleted
=====================================
@@ -1,6 +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 -no-hs-main.
-    Call hs_init_ghc() from your main() function to set these options.
-Warning: -rtsopts and -with-rtsopts have no effect with -no-hs-main.
-    Call hs_init_ghc() from your main() function to set these options.



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/31f9b6ea1fc2163b09d0041ce610efe0f3661a66

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/31f9b6ea1fc2163b09d0041ce610efe0f3661a66
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/20231115/6d38cf9d/attachment-0001.html>