[commit: testsuite] overlapping-tyfams: Revert "Fix test case to reflect banning nonlinear standalone instances." (9069fb7)

Richard Eisenberg eir at cis.upenn.edu
Fri Jun 21 15:17:03 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : overlapping-tyfams

https://github.com/ghc/testsuite/commit/9069fb7a0d3d9648593293c09fa4386ba2b0e96c

>---------------------------------------------------------------

commit 9069fb7a0d3d9648593293c09fa4386ba2b0e96c
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Jun 11 19:01:19 2013 +0100

    Revert "Fix test case to reflect banning nonlinear standalone instances."
    
    This reverts commit 50bfe9ae6b68270120a93c420618eabfcaa817af.

>---------------------------------------------------------------

 .../NonLinearLHS.hs                                |    0 
 tests/indexed-types/should_compile/all.T           |    1 +
 .../indexed-types/should_fail/NonLinearLHS.stderr  |   12 ------------
 tests/indexed-types/should_fail/all.T              |    2 --
 4 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/tests/indexed-types/should_fail/NonLinearLHS.hs b/tests/indexed-types/should_compile/NonLinearLHS.hs
similarity index 100%
rename from tests/indexed-types/should_fail/NonLinearLHS.hs
rename to tests/indexed-types/should_compile/NonLinearLHS.hs
diff --git a/tests/indexed-types/should_compile/all.T b/tests/indexed-types/should_compile/all.T
index c6a8c67..15e9877 100644
--- a/tests/indexed-types/should_compile/all.T
+++ b/tests/indexed-types/should_compile/all.T
@@ -28,6 +28,7 @@ test('Simple23', normal, compile, [''])
 test('Simple24', normal, compile, [''])
 
 test('RelaxedExamples', normal, compile, [''])
+test('NonLinearLHS', normal, compile, [''])
 
 test('ind1', normal, compile, [''])
 test('ind2',
diff --git a/tests/indexed-types/should_fail/NonLinearLHS.stderr b/tests/indexed-types/should_fail/NonLinearLHS.stderr
deleted file mode 100644
index 47f7955..0000000
--- a/tests/indexed-types/should_fail/NonLinearLHS.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-
-NonLinearLHS.hs:8:15:
-    Repeated variable in standalone instance not allowed: E a a
-    In the type instance declaration for ‛E’
-
-NonLinearLHS.hs:14:1:
-    Repeated variable in standalone instance not allowed: F a a
-    In the data instance declaration for ‛F’
-
-NonLinearLHS.hs:25:15:
-    Repeated variable in standalone instance not allowed: EqTy a a
-    In the type instance declaration for ‛EqTy’
diff --git a/tests/indexed-types/should_fail/all.T b/tests/indexed-types/should_fail/all.T
index b7a149e..1ef4329 100644
--- a/tests/indexed-types/should_fail/all.T
+++ b/tests/indexed-types/should_fail/all.T
@@ -1,8 +1,6 @@
 setTestOpts(only_compiler_types(['ghc']))
 setTestOpts(omit_ways(['optasm']))
 
-test('NonLinearLHS', normal, compile_fail, [''])
-
 test('SimpleFail1a', normal, compile_fail, [''])
 test('SimpleFail1b', normal, compile_fail, [''])
 test('SimpleFail2a', normal, compile_fail, [''])





More information about the ghc-commits mailing list