summaryrefslogtreecommitdiff
path: root/testsuite/tests/roles
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2015-04-21 10:26:25 -0700
committerEdward Z. Yang <ezyang@cs.stanford.edu>2015-04-22 05:39:55 -0700
commit1bd1ceffce7f3027ae632086844f95976ed600c8 (patch)
treefb0281af2cae35b7c874a7d05feb38c45eac3ad8 /testsuite/tests/roles
parent1bb1ff2253a7f235f7ef45b06321b104c0365d99 (diff)
downloadhaskell-1bd1ceffce7f3027ae632086844f95976ed600c8.tar.gz
Don't use self {-# SOURCE #-} import in test-cases.
Summary: It's kind of buggy, c.f. #10182, and isn't motivated by any real world programs, so we're going to get rid of it (despite it being handy for GHC test cases.) Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu> Test Plan: validate Reviewers: simonpj, austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D862
Diffstat (limited to 'testsuite/tests/roles')
-rw-r--r--testsuite/tests/roles/should_fail/Makefile2
-rw-r--r--testsuite/tests/roles/should_fail/Roles12.hs2
-rw-r--r--testsuite/tests/roles/should_fail/Roles12a.hs2
-rw-r--r--testsuite/tests/roles/should_fail/T9204.hs2
-rw-r--r--testsuite/tests/roles/should_fail/T9204a.hs2
-rw-r--r--testsuite/tests/roles/should_fail/all.T4
6 files changed, 10 insertions, 4 deletions
diff --git a/testsuite/tests/roles/should_fail/Makefile b/testsuite/tests/roles/should_fail/Makefile
index 14d6720060..74ed7c1e8a 100644
--- a/testsuite/tests/roles/should_fail/Makefile
+++ b/testsuite/tests/roles/should_fail/Makefile
@@ -6,8 +6,10 @@ include $(TOP)/mk/test.mk
Roles12:
'$(TEST_HC)' $(TEST_HC_OPTS) -c Roles12.hs-boot
+ '$(TEST_HC)' $(TEST_HC_OPTS) -c Roles12a.hs
-'$(TEST_HC)' $(TEST_HC_OPTS) -c Roles12.hs
T9204:
'$(TEST_HC)' $(TEST_HC_OPTS) -c T9204.hs-boot
+ -'$(TEST_HC)' $(TEST_HC_OPTS) -c T9204a.hs
-'$(TEST_HC)' $(TEST_HC_OPTS) -c T9204.hs
diff --git a/testsuite/tests/roles/should_fail/Roles12.hs b/testsuite/tests/roles/should_fail/Roles12.hs
index 875d105b78..0942a0be41 100644
--- a/testsuite/tests/roles/should_fail/Roles12.hs
+++ b/testsuite/tests/roles/should_fail/Roles12.hs
@@ -1,5 +1,5 @@
module Roles12 where
-import {-# SOURCE #-} Roles12
+import Roles12a
data T a
diff --git a/testsuite/tests/roles/should_fail/Roles12a.hs b/testsuite/tests/roles/should_fail/Roles12a.hs
new file mode 100644
index 0000000000..a7c02c5fcd
--- /dev/null
+++ b/testsuite/tests/roles/should_fail/Roles12a.hs
@@ -0,0 +1,2 @@
+module Roles12a where
+import {-# SOURCE #-} Roles12
diff --git a/testsuite/tests/roles/should_fail/T9204.hs b/testsuite/tests/roles/should_fail/T9204.hs
index e2351a277f..52befcac20 100644
--- a/testsuite/tests/roles/should_fail/T9204.hs
+++ b/testsuite/tests/roles/should_fail/T9204.hs
@@ -1,6 +1,6 @@
module T9204 where
-import {-# SOURCE #-} T9204
+import T9204a
data D a
diff --git a/testsuite/tests/roles/should_fail/T9204a.hs b/testsuite/tests/roles/should_fail/T9204a.hs
new file mode 100644
index 0000000000..a57e2b28a2
--- /dev/null
+++ b/testsuite/tests/roles/should_fail/T9204a.hs
@@ -0,0 +1,2 @@
+module T9204a where
+import {-# SOURCE #-} T9204
diff --git a/testsuite/tests/roles/should_fail/all.T b/testsuite/tests/roles/should_fail/all.T
index 94674daa26..f01205e364 100644
--- a/testsuite/tests/roles/should_fail/all.T
+++ b/testsuite/tests/roles/should_fail/all.T
@@ -5,9 +5,9 @@ test('Roles8', normal, compile_fail, [''])
test('Roles10', normal, compile_fail, [''])
test('Roles11', normal, compile_fail, [''])
test('Roles12',
- extra_clean(['Roles12.o-boot', 'Roles12.hi-boot']),
+ extra_clean(['Roles12.o-boot', 'Roles12.hi-boot', 'Roles12a.o', 'Roles12a.hi']),
run_command, ['$MAKE --no-print-directory -s Roles12'])
test('T8773', normal, compile_fail, [''])
-test('T9204', extra_clean(['T9204.o-boot', 'T9204.hi-boot']),
+test('T9204', extra_clean(['T9204.o-boot', 'T9204.hi-boot', 'T9204a.o', 'T9204a.hi-boot']),
run_command, ['$MAKE --no-print-directory -s T9204'])
test('RolesIArray', normal, compile_fail, [''])