diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-09-10 12:00:39 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-12 19:16:40 -0400 |
| commit | 9074b7484a0e438a2c1fbb900ab213ae17c04641 (patch) | |
| tree | c22b2a63973c8a97c48238cfe2f1196d20485dd8 | |
| parent | 5987357b2498db6b8014d96a6a2ef987b4158983 (diff) | |
| download | haskell-9074b7484a0e438a2c1fbb900ab213ae17c04641.tar.gz | |
testsuite: Move big-obj test from ghci/linking/dyn to ghci/linking
There was nothing dynamic about this test.
| -rw-r--r-- | testsuite/tests/ghci/linking/Makefile | 5 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/all.T | 5 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/big-obj-c.c (renamed from testsuite/tests/ghci/linking/dyn/big-obj-c.c) | 0 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/big-obj.hs (renamed from testsuite/tests/ghci/linking/dyn/big-obj.hs) | 0 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/big-obj.stdout (renamed from testsuite/tests/ghci/linking/dyn/big-obj.stdout) | 0 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/dyn/Makefile | 5 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/dyn/all.T | 4 |
7 files changed, 10 insertions, 9 deletions
diff --git a/testsuite/tests/ghci/linking/Makefile b/testsuite/tests/ghci/linking/Makefile index 2c71e96cc6..f9553b5594 100644 --- a/testsuite/tests/ghci/linking/Makefile +++ b/testsuite/tests/ghci/linking/Makefile @@ -150,3 +150,8 @@ T14708: T15729: "$(TEST_HC)" -fPIC -c T15729.c -o bss.o echo "main" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) bss.o T15729.hs + +.PHONY: big-obj +big-obj: + '$(TEST_CC)' -c -Wa,-mbig-obj big-obj-c.c -o big-obj-c.o + echo "main" | '$(TEST_HC)' $(TEST_HC_OPTS_INTERACTIVE) big-obj-c.o big-obj.hs diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T index a0afa9edcd..655941d145 100644 --- a/testsuite/tests/ghci/linking/all.T +++ b/testsuite/tests/ghci/linking/all.T @@ -70,3 +70,8 @@ test('T15729', [extra_files(['T15729.hs', 'T15729.c']), unless(doing_ghci, skip)], makefile_test, ['T15729']) + +test('big-obj', [extra_files(['big-obj-c.c', 'big-obj.hs']), + unless(doing_ghci, skip), unless(opsys('mingw32'), skip)], + makefile_test, ['big-obj']) + diff --git a/testsuite/tests/ghci/linking/dyn/big-obj-c.c b/testsuite/tests/ghci/linking/big-obj-c.c index bd82d5e50c..bd82d5e50c 100644 --- a/testsuite/tests/ghci/linking/dyn/big-obj-c.c +++ b/testsuite/tests/ghci/linking/big-obj-c.c diff --git a/testsuite/tests/ghci/linking/dyn/big-obj.hs b/testsuite/tests/ghci/linking/big-obj.hs index 386f728cdd..386f728cdd 100644 --- a/testsuite/tests/ghci/linking/dyn/big-obj.hs +++ b/testsuite/tests/ghci/linking/big-obj.hs diff --git a/testsuite/tests/ghci/linking/dyn/big-obj.stdout b/testsuite/tests/ghci/linking/big-obj.stdout index 98d9bcb75a..98d9bcb75a 100644 --- a/testsuite/tests/ghci/linking/dyn/big-obj.stdout +++ b/testsuite/tests/ghci/linking/big-obj.stdout diff --git a/testsuite/tests/ghci/linking/dyn/Makefile b/testsuite/tests/ghci/linking/dyn/Makefile index ee53d0463e..7f14f7d08a 100644 --- a/testsuite/tests/ghci/linking/dyn/Makefile +++ b/testsuite/tests/ghci/linking/dyn/Makefile @@ -102,8 +102,3 @@ T1407: .PHONY: T13606 T13606: echo ":q" | '$(TEST_HC)' $(TEST_HC_OPTS_INTERACTIVE) -lgcc_s - -.PHONY: big-obj -big-obj: - '$(TEST_CC)' -c -Wa,-mbig-obj big-obj-c.c -o big-obj-c.o - echo "main" | '$(TEST_HC)' $(TEST_HC_OPTS_INTERACTIVE) big-obj-c.o big-obj.hs diff --git a/testsuite/tests/ghci/linking/dyn/all.T b/testsuite/tests/ghci/linking/dyn/all.T index 5e84a87477..e2593ded9b 100644 --- a/testsuite/tests/ghci/linking/dyn/all.T +++ b/testsuite/tests/ghci/linking/dyn/all.T @@ -45,10 +45,6 @@ test('T13606', [unless(doing_ghci, skip), unless(opsys('mingw32'), skip), exit_code(0)], makefile_test, ['T13606']) -test('big-obj', [extra_files(['big-obj-c.c', 'big-obj.hs']), - unless(doing_ghci, skip), unless(opsys('mingw32'), skip)], - makefile_test, ['big-obj']) - test('T3372', [unless(doing_ghci, skip), req_rts_linker, |