[commit: ghc] master: Testsuite Windows: fix sigof01m, sigof012m and sigof02dm (8d45ccd)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8d45ccddafa7c8da4a01d74a0c6810e36258cf84/ghc

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

commit 8d45ccddafa7c8da4a01d74a0c6810e36258cf84
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 18 00:45:28 2015 +0100

    Testsuite Windows: fix sigof01m, sigof012m and sigof02dm


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

8d45ccddafa7c8da4a01d74a0c6810e36258cf84
 testsuite/tests/driver/sigof01/all.T                    |  2 +-
 testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32  |  8 --------
 testsuite/tests/driver/sigof02/all.T                    |  4 ++--
 testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 | 10 ----------
 testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32  | 11 -----------
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/testsuite/tests/driver/sigof01/all.T b/testsuite/tests/driver/sigof01/all.T
index d0cdc3c..077263a 100644
--- a/testsuite/tests/driver/sigof01/all.T
+++ b/testsuite/tests/driver/sigof01/all.T
@@ -4,6 +4,6 @@ test('sigof01',
      ['$MAKE -s --no-print-directory sigof01'])
 
 test('sigof01m',
-     [ clean_cmd('rm -rf tmp_sigof01m') ],
+     [ clean_cmd('rm -rf tmp_sigof01m'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory sigof01m'])
diff --git a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32 b/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32
deleted file mode 100644
index 898dc7a..0000000
--- a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32
+++ /dev/null
@@ -1,8 +0,0 @@
-[1 of 4] Compiling A                ( A.hs, tmp_sigof01m\A.o )
-[2 of 4] Compiling B[boot]          ( B.hs-boot, tmp_sigof01m\B.o-boot )
-[3 of 4] Compiling B[merge]         ( B.hi, tmp_sigof01m\B.o )
-[4 of 4] Compiling Main             ( Main.hs, tmp_sigof01m\Main.o )
-Linking tmp_sigof01m/Main.exe ...
-False
-T
-True
diff --git a/testsuite/tests/driver/sigof02/all.T b/testsuite/tests/driver/sigof02/all.T
index 9cb1ea5..68c08ef 100644
--- a/testsuite/tests/driver/sigof02/all.T
+++ b/testsuite/tests/driver/sigof02/all.T
@@ -9,7 +9,7 @@ test('sigof02t',
      ['$MAKE -s --no-print-directory sigof02t'])
 
 test('sigof02m',
-     [ clean_cmd('rm -rf tmp_sigof02m') ],
+     [ clean_cmd('rm -rf tmp_sigof02m'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory sigof02m'])
 
@@ -30,7 +30,7 @@ test('sigof02dt',
 
 
 test('sigof02dm',
-     [ clean_cmd('rm -rf tmp_sigof02dm') ],
+     [ clean_cmd('rm -rf tmp_sigof02dm'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory sigof02dm'])
 
diff --git a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32
deleted file mode 100644
index 7fde989..0000000
--- a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32
+++ /dev/null
@@ -1,10 +0,0 @@
-[1 of 5] Compiling MapAsSet[boot]   ( MapAsSet.hs-boot, tmp_sigof02dm\MapAsSet.o-boot )
-[2 of 5] Compiling MapAsSet[merge]  ( MapAsSet.hi, tmp_sigof02dm\MapAsSet.o )
-[3 of 5] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02dm\Map.o-boot )
-[4 of 5] Compiling Map[merge]       ( Map.hi, tmp_sigof02dm\Map.o )
-[5 of 5] Compiling Main             ( Double.hs, tmp_sigof02dm\Main.o )
-Linking tmp_sigof02dm/Double.exe ...
-False
-fromList [0,6]
-[(0,"foo"),(6,"foo")]
-fromList [(0,"foo"),(6,"foo")]
diff --git a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32
deleted file mode 100644
index f7cca89..0000000
--- a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32
+++ /dev/null
@@ -1,11 +0,0 @@
-[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m\Map.o-boot )
-[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m\Map.o )
-[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o )
-Linking tmp_sigof02m/StrictMain.exe ...
-[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m\Map.o-boot ) [sig-of changed]
-[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m\Map.o ) [sig-of changed]
-[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o ) [Map changed]
-Linking tmp_sigof02m/LazyMain.exe ...
-False
-[(0,"foo"),(6,"foo")]
-fromList [(0,"foo"),(6,"foo")]