testsuite: Clean up tests depending on C++ std lib

5 files changed, 5 insertions, 21 deletions

diff --git a/testsuite/tests/ghci/linking/Makefile b/testsuite/tests/ghci/linking/Makefile
index 78d13c6e8a..7b77e91c09 100644
--- a/testsuite/tests/ghci/linking/Makefile
+++ b/testsuite/tests/ghci/linking/Makefile
@@ -24,12 +24,6 @@ else
 DLL = lib$1.so
 endif
 
-ifeq "$(LIBCXX_PLATFORM)" "YES"
-LIBCXX=c++
-else
-LIBCXX=stdc++
-endif
-
 .PHONY: ghcilink002
 ghcilink002 :
 	$(RM) -rf dir002
@@ -118,11 +112,7 @@ ghcilink006 :
 	echo "version: 1.0" >>$(PKG006)
 	echo "id: test-XXX" >>$(PKG006)
 	echo "key: test-XXX" >>$(PKG006)
-ifeq "$(WINDOWS)" "YES"
-	echo "extra-libraries: stdc++-6" >>$(PKG006)
-else
 	echo "extra-libraries: $(LIBCXX)" >>$(PKG006)
-endif
 	'$(GHC_PKG)' init $(LOCAL_PKGCONF006)
 	'$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF006) register $(PKG006) -v0
 	#
diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T
index 40d79cbc09..b4564f0237 100644
--- a/testsuite/tests/ghci/linking/all.T
+++ b/testsuite/tests/ghci/linking/all.T
@@ -12,8 +12,6 @@ test('ghcilink002', [extra_files(['TestLink.hs', 'f.c']),
 
 test('ghcilink003',
      [ unless(doing_ghci, skip),
-       # libstdc++ is GCC-specific on FreeBSD. FreeBSD has libc++ though.
-       when(opsys('freebsd'), fragile(17739)),
        # from Big Sur onwards, we can't dlopen libstdc++.dylib
        # anymore. Will produce:
        #   dlopen(libstdc++.dylib, 5): image not found
@@ -36,8 +34,6 @@ test('ghcilink005',
 
 test('ghcilink006',
      [ unless(doing_ghci, skip),
-       # libstdc++ is GCC-specific on FreeBSD. FreeBSD has libc++ though.
-       when(opsys('freebsd'), fragile(17739)),
        # from Big Sur onwards, we can't dlopen libstdc++.dylib
        # anymore. Will produce:
        #   dlopen(libstdc++.dylib, 5): image not found
diff --git a/testsuite/tests/rts/T10672/Makefile b/testsuite/tests/rts/T10672/Makefile
index 5fc458857e..bcc9a5c22b 100644
--- a/testsuite/tests/rts/T10672/Makefile
+++ b/testsuite/tests/rts/T10672/Makefile
@@ -3,9 +3,9 @@ include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
 T10672_x64:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_seh-1 -lstdc++-6 \
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_seh-1 -l${LIBCXX} \
 		Main.hs Printf.hs cxxy.cpp
 
 T10672_x86:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_dw2-1 -lstdc++-6 \
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -rtsopts=none -fforce-recomp -lgcc_s_dw2-1 -${LIBCXX} \
 		Main.hs Printf.hs cxxy.cpp
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 32afacc5e8..cf0b7b2a09 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -474,7 +474,8 @@ test('keep-cafs',
 # Test proper functioning of C++ exceptions within a C++ program.
 # On darwin, this requires -fcompact-unwind.
 # When -fcompact-unwind becomes default, generalize test to all platforms.
-test('T11829', unless(opsys('darwin'), skip), compile_and_run, ['T11829_c.cpp -lstdc++ -fcompact-unwind'])
+test('T11829', unless(opsys('darwin'), skip), compile_and_run,
+     ['T11829_c.cpp -l{} -fcompact-unwind'.format(config.stdcxx_impl)])
 
 test('T16514', normal, compile_and_run, ['T16514_c.c'])
 test('test-zeroongc', extra_run_opts('-DZ'), compile_and_run, ['-debug'])
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index d04bb08b29..7fd9ce6bed 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -397,12 +397,9 @@ test('T13098', normal, compile, ['-v0'])
 test('T11046', normal, multimod_compile, ['T11046','-v0'])
 test('T13366',
      [expect_broken_for(13366, ['ghci']),
-      # libstdc++ is GCC-specific on FreeBSD, the test will
-      # fail with clang, and pass with GCC.
-      when(opsys('freebsd'), fragile(17739)),
       when(opsys('darwin'), expect_broken(16083))],
      compile_and_run,
-     ['-lstdc++ -v0'] if not opsys('openbsd') else ['-lc++ -lc++abi -v0'])
+     ['-l{} -v0'.format(config.stdcxx_impl)])
 test('T13473', normal, multimod_compile_and_run,
      ['T13473.hs', '-v0 ' + config.ghc_th_way_flags])
 test('T13587', expect_broken(13587), compile_and_run, ['-v0'])