[commit: ghc] master: Make T10970a non-dependent on GCC version. (19354fb)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/19354fb22767bfdcc525d2f851e24cd8a493e84f/ghc

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

commit 19354fb22767bfdcc525d2f851e24cd8a493e84f
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Tue Oct 27 10:42:51 2015 -0700

    Make T10970a non-dependent on GCC version.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


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

19354fb22767bfdcc525d2f851e24cd8a493e84f
 testsuite/tests/driver/T10970a.hs                                   | 6 ++++--
 testsuite/tests/driver/T10970a.stderr                               | 6 ------
 .../{simplCore/should_run/T5453.stdout => driver/T10970a.stdout}    | 1 +
 testsuite/tests/driver/all.T                                        | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/testsuite/tests/driver/T10970a.hs b/testsuite/tests/driver/T10970a.hs
index 9de4f80..8e7aa60 100644
--- a/testsuite/tests/driver/T10970a.hs
+++ b/testsuite/tests/driver/T10970a.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE CPP #-}
 main = do
-    putStrLn VERSION_containers
-#if MIN_VERSION_base(3,0,0)
+#ifndef VERSION_containers
+    putStrLn "OK"
+#endif
+#ifndef MIN_VERSION_base
     putStrLn "OK"
 #endif
diff --git a/testsuite/tests/driver/T10970a.stderr b/testsuite/tests/driver/T10970a.stderr
index 74c6821..e69de29 100644
--- a/testsuite/tests/driver/T10970a.stderr
+++ b/testsuite/tests/driver/T10970a.stderr
@@ -1,6 +0,0 @@
-
-T10970a.hs:4:0: error:
-     error: missing binary operator before token "("
-     #if MIN_VERSION_base(3,0,0)
-     ^
-`gcc' failed in phase `C pre-processor'. (Exit code: 1)
diff --git a/testsuite/tests/simplCore/should_run/T5453.stdout b/testsuite/tests/driver/T10970a.stdout
similarity index 50%
copy from testsuite/tests/simplCore/should_run/T5453.stdout
copy to testsuite/tests/driver/T10970a.stdout
index e178f82..2c94e48 100644
--- a/testsuite/tests/simplCore/should_run/T5453.stdout
+++ b/testsuite/tests/driver/T10970a.stdout
@@ -1 +1,2 @@
 OK
+OK
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index f946055..7c74cb6 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -458,4 +458,4 @@ test('T9360a', normal, run_command, ['{compiler} --interactive -e ""'])
 test('T9360b', normal, run_command, ['{compiler} -e "" --interactive'])
 
 test('T10970', normal, compile_and_run, ['-hide-all-packages -package base -package containers'])
-test('T10970a', normal, compile_fail, [''])
+test('T10970a', normal, compile_and_run, [''])