diff options
| author | Viktor Dukhovni <ietf-dane@dukhovni.org> | 2021-04-20 14:01:12 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-04-22 17:00:55 -0400 |
| commit | 7bc7eea3897dcb8a87fdb0921f451b9bc77309f6 (patch) | |
| tree | 352c31935dadad519efee435a26647341cdc870d /testsuite/tests/ghci/linking | |
| parent | 72b48c4440c3bbb7344b15c13c7ddb56019b0af5 (diff) | |
| download | haskell-7bc7eea3897dcb8a87fdb0921f451b9bc77309f6.tar.gz | |
Make tests more portable on FreeBSD
Diffstat (limited to 'testsuite/tests/ghci/linking')
| -rw-r--r-- | testsuite/tests/ghci/linking/Makefile | 10 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/all.T | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/testsuite/tests/ghci/linking/Makefile b/testsuite/tests/ghci/linking/Makefile index 085e81765b..2c71e96cc6 100644 --- a/testsuite/tests/ghci/linking/Makefile +++ b/testsuite/tests/ghci/linking/Makefile @@ -24,6 +24,12 @@ else DLL = lib$1.so endif +ifeq "$(FREEBSD)" "YES" +LIBCXX=c++ +else +LIBCXX=stdc++ +endif + .PHONY: ghcilink002 ghcilink002 : $(RM) -rf dir002 @@ -38,7 +44,7 @@ ghcilink002 : .PHONY: ghcilink003 ghcilink003 : - echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -lstdc++ + echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -l$(LIBCXX) # Test 4: # package P @@ -115,7 +121,7 @@ ghcilink006 : ifeq "$(WINDOWS)" "YES" echo "extra-libraries: stdc++-6" >>$(PKG006) else - echo "extra-libraries: stdc++" >>$(PKG006) + 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 79ec5e5f98..743067518f 100644 --- a/testsuite/tests/ghci/linking/all.T +++ b/testsuite/tests/ghci/linking/all.T @@ -12,8 +12,8 @@ test('ghcilink002', [extra_files(['TestLink.hs', 'f.c']), test('ghcilink003', [unless(doing_ghci, skip), - # libstdc++ is named differently on FreeBSD - when(opsys('freebsd'), expect_broken(17739))], + # libstdc++ is GCC-specific on FreeBSD + when(opsys('freebsd'), fragile(17739))], makefile_test, ['ghcilink003']) @@ -32,8 +32,8 @@ test('ghcilink005', test('ghcilink006', [unless(doing_ghci, skip), - # libstdc++ is named differently on FreeBSD - when(opsys('freebsd'), expect_broken(17739))], + # libstdc++ is GCC-specific on FreeBSD + when(opsys('freebsd'), fragile(17739))], makefile_test, ['ghcilink006']) |