Testsuite: rename *.stderr-ghc to *.stderr

And *.stdout-ghc to *.stdout. We only have output files for ghc now.

36 files changed, 3 insertions, 14 deletions

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index d31cf9b9e7..a7c1bed9f4 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -2104,7 +2104,7 @@ def qualify( name, suff ):
 
 # Finding the sample output.  The filename is of the form
 #
-#   <test>.stdout[-ghc][-<version>][-ws-<wordsize>][-<platform>]
+#   <test>.stdout[-ghc-<version>][-ws-<wordsize>][-<platform>]
 #
 # and we pick the most specific version available.  The <version> is
 # the major version of the compiler (e.g. 6.8.2 would be "6.8").  For
@@ -2114,13 +2114,12 @@ def platform_wordsize_qualify( name, suff ):
 
     basepath = qualify(name, suff)
 
-    paths = [(platformSpecific, basepath + comp + vers + ws + plat)
+    paths = [(platformSpecific, basepath + ghcversion + ws + plat)
              for (platformSpecific, plat) in [(1, '-' + config.platform),
                                               (1, '-' + config.os),
                                               (0, '')]
              for ws   in ['-ws-' + config.wordsize, '']
-             for comp in ['-ghc', '']
-             for vers in ['-' + config.compiler_maj_version, '']]
+             for ghcversion in ['-ghc-' + config.compiler_maj_version, '']]
 
     dir = glob.glob(basepath + '*')
     dir = [normalise_slashes_(d) for d in dir]
diff --git a/testsuite/tests/deSugar/should_compile/ds002.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds002.stderr
index fe4ec94873..fe4ec94873 100644
--- a/testsuite/tests/deSugar/should_compile/ds002.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds002.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds003.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds003.stderr
index 1b4c018b62..1b4c018b62 100644
--- a/testsuite/tests/deSugar/should_compile/ds003.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds003.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds019.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds019.stderr
index 4d6e60f1fa..4d6e60f1fa 100644
--- a/testsuite/tests/deSugar/should_compile/ds019.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds019.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds020.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds020.stderr
index 4120a957d3..4120a957d3 100644
--- a/testsuite/tests/deSugar/should_compile/ds020.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds020.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds022.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds022.stderr
index 45fe3d8a95..45fe3d8a95 100644
--- a/testsuite/tests/deSugar/should_compile/ds022.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds022.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds040.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds040.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/deSugar/should_compile/ds040.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds040.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds041.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds041.stderr
index c276b77ce9..c276b77ce9 100644
--- a/testsuite/tests/deSugar/should_compile/ds041.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds041.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds043.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds043.stderr
index 8529a8c737..8529a8c737 100644
--- a/testsuite/tests/deSugar/should_compile/ds043.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds043.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds051.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds051.stderr
index 76bc4d3968..76bc4d3968 100644
--- a/testsuite/tests/deSugar/should_compile/ds051.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds051.stderr
diff --git a/testsuite/tests/deSugar/should_compile/ds053.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds053.stderr
index 52aa9d7917..52aa9d7917 100644
--- a/testsuite/tests/deSugar/should_compile/ds053.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds053.stderr
diff --git a/testsuite/tests/module/mod128.stderr-ghc b/testsuite/tests/module/mod128.stderr
index bfd02c6b8d..bfd02c6b8d 100644
--- a/testsuite/tests/module/mod128.stderr-ghc
+++ b/testsuite/tests/module/mod128.stderr
diff --git a/testsuite/tests/module/mod14.stderr-ghc b/testsuite/tests/module/mod14.stderr
index 682cbe3400..682cbe3400 100644
--- a/testsuite/tests/module/mod14.stderr-ghc
+++ b/testsuite/tests/module/mod14.stderr
diff --git a/testsuite/tests/module/mod5.stderr-ghc b/testsuite/tests/module/mod5.stderr
index 07967f0e21..07967f0e21 100644
--- a/testsuite/tests/module/mod5.stderr-ghc
+++ b/testsuite/tests/module/mod5.stderr
diff --git a/testsuite/tests/numeric/should_run/arith001.stdout-ghc b/testsuite/tests/numeric/should_run/arith001.stdout-ghc
deleted file mode 100644
index 741c4809ef..0000000000
--- a/testsuite/tests/numeric/should_run/arith001.stdout-ghc
+++ /dev/null
@@ -1,5 +0,0 @@
-42 % 1
-42, 1
-42.0, 1.0
-5910974510923776, -47
-5910974510923776, -47
diff --git a/testsuite/tests/numeric/should_run/arith002.stdout-ghc b/testsuite/tests/numeric/should_run/arith002.stdout-ghc
deleted file mode 100644
index ab717549fd..0000000000
--- a/testsuite/tests/numeric/should_run/arith002.stdout-ghc
+++ /dev/null
@@ -1,4 +0,0 @@
-[0 % 1,0 % 1,0 % 1,2 % 1,2 % 1,(-2) % 1,(-2) % 1,22 % 7,1 % 5000]
-[0,0,0,2,2,-2,-2,22,1,1,1,1,1,1,1,1,7,5000]
-[0 % 1,0 % 1,0 % 1,2 % 1,2 % 1,(-2) % 1,(-2) % 1,22 % 7,1 % 5000]
-[0,0,0,2,2,-2,-2,22,1,1,1,1,1,1,1,1,7,5000]
diff --git a/testsuite/tests/parser/should_compile/read014.stderr-ghc b/testsuite/tests/parser/should_compile/read014.stderr
index f3d8d604fb..f3d8d604fb 100644
--- a/testsuite/tests/parser/should_compile/read014.stderr-ghc
+++ b/testsuite/tests/parser/should_compile/read014.stderr
diff --git a/testsuite/tests/rename/should_compile/T3262.stderr-ghc b/testsuite/tests/rename/should_compile/T3262.stderr
index 0639076dc0..0639076dc0 100644
--- a/testsuite/tests/rename/should_compile/T3262.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/T3262.stderr
diff --git a/testsuite/tests/rename/should_compile/mc10.stderr-ghc b/testsuite/tests/rename/should_compile/mc10.stderr
index b0d32552b4..b0d32552b4 100644
--- a/testsuite/tests/rename/should_compile/mc10.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/mc10.stderr
diff --git a/testsuite/tests/rename/should_compile/rn037.stderr-ghc b/testsuite/tests/rename/should_compile/rn037.stderr
index 8dea678d42..8dea678d42 100644
--- a/testsuite/tests/rename/should_compile/rn037.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn037.stderr
diff --git a/testsuite/tests/rename/should_compile/rn039.stderr-ghc b/testsuite/tests/rename/should_compile/rn039.stderr
index de8618d5f0..de8618d5f0 100644
--- a/testsuite/tests/rename/should_compile/rn039.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn039.stderr
diff --git a/testsuite/tests/rename/should_compile/rn040.stderr-ghc b/testsuite/tests/rename/should_compile/rn040.stderr
index f482b47511..f482b47511 100644
--- a/testsuite/tests/rename/should_compile/rn040.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn040.stderr
diff --git a/testsuite/tests/rename/should_compile/rn041.stderr-ghc b/testsuite/tests/rename/should_compile/rn041.stderr
index e9c2727742..e9c2727742 100644
--- a/testsuite/tests/rename/should_compile/rn041.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn041.stderr
diff --git a/testsuite/tests/rename/should_compile/rn046.stderr-ghc b/testsuite/tests/rename/should_compile/rn046.stderr
index c2a4195287..c2a4195287 100644
--- a/testsuite/tests/rename/should_compile/rn046.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn046.stderr
diff --git a/testsuite/tests/rename/should_compile/rn047.stderr-ghc b/testsuite/tests/rename/should_compile/rn047.stderr
index 0987f356fa..0987f356fa 100644
--- a/testsuite/tests/rename/should_compile/rn047.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn047.stderr
diff --git a/testsuite/tests/rename/should_compile/rn055.stderr-ghc b/testsuite/tests/rename/should_compile/rn055.stderr
index 1b928b46cf..1b928b46cf 100644
--- a/testsuite/tests/rename/should_compile/rn055.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn055.stderr
diff --git a/testsuite/tests/typecheck/prog001/typecheck.prog001.stderr-ghc b/testsuite/tests/typecheck/prog001/typecheck.prog001.stderr
index 70e210fa3e..70e210fa3e 100644
--- a/testsuite/tests/typecheck/prog001/typecheck.prog001.stderr-ghc
+++ b/testsuite/tests/typecheck/prog001/typecheck.prog001.stderr
diff --git a/testsuite/tests/typecheck/should_compile/HasKey.stderr-ghc b/testsuite/tests/typecheck/should_compile/HasKey.stderr
index dd4d290cda..dd4d290cda 100644
--- a/testsuite/tests/typecheck/should_compile/HasKey.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/HasKey.stderr
diff --git a/testsuite/tests/typecheck/should_compile/T7903.stderr-ghc b/testsuite/tests/typecheck/should_compile/T7903.stderr
index 7020e1c0e5..7020e1c0e5 100644
--- a/testsuite/tests/typecheck/should_compile/T7903.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/T7903.stderr
diff --git a/testsuite/tests/typecheck/should_compile/tc078.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc078.stderr
index fa9d3acd2e..fa9d3acd2e 100644
--- a/testsuite/tests/typecheck/should_compile/tc078.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc078.stderr
diff --git a/testsuite/tests/typecheck/should_compile/tc115.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc115.stderr
index 4f7981ac56..4f7981ac56 100644
--- a/testsuite/tests/typecheck/should_compile/tc115.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc115.stderr
diff --git a/testsuite/tests/typecheck/should_compile/tc116.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc116.stderr
index 074a795956..074a795956 100644
--- a/testsuite/tests/typecheck/should_compile/tc116.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc116.stderr
diff --git a/testsuite/tests/typecheck/should_compile/tc125.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc125.stderr
index d57cda2b19..d57cda2b19 100644
--- a/testsuite/tests/typecheck/should_compile/tc125.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc125.stderr
diff --git a/testsuite/tests/typecheck/should_compile/tc126.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc126.stderr
index 3c766d813e..3c766d813e 100644
--- a/testsuite/tests/typecheck/should_compile/tc126.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc126.stderr
diff --git a/testsuite/tests/typecheck/should_compile/tc161.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc161.stderr
index 163fde19cd..163fde19cd 100644
--- a/testsuite/tests/typecheck/should_compile/tc161.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc161.stderr
diff --git a/testsuite/tests/typecheck/should_run/tcrun003.stdout-ghc b/testsuite/tests/typecheck/should_run/tcrun003.stdout-ghc
deleted file mode 100644
index 14896f2f71..0000000000
--- a/testsuite/tests/typecheck/should_run/tcrun003.stdout-ghc
+++ /dev/null
@@ -1 +0,0 @@
-3 % 1