[commit: process] master: Fix process004 on Windows (2b87e24)

Ian Lynagh igloo at earth.li
Sun Jun 2 23:22:46 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/packages/process

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2b87e244102b4b3f188d949b68918404b9c3a395

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

commit 2b87e244102b4b3f188d949b68918404b9c3a395
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Jun 2 22:15:38 2013 +0100

    Fix process004 on Windows

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

 tests/all.T                     |    8 +-------
 tests/process004.stderr-mingw32 |    1 -
 tests/process004.stdout-mingw32 |    1 -
 3 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/tests/all.T b/tests/all.T
index d1984e5..643863b 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,13 +1,7 @@
 test('process001', extra_clean(['process001.out']), compile_and_run, [''])
 test('process002', extra_clean(['process002.out']), compile_and_run, [''])
 test('process003', omit_ways(['ghci']), compile_and_run, [''])
-
-if config.os == "mingw32":
-      proc004_config = exit_code(1)
-else:
-      proc004_config = normal
-
-test('process004', [ proc004_config, normalise_exe ], compile_and_run, [''])
+test('process004', normalise_exe, compile_and_run, [''])
 test('T1780', normal, compile_and_run, [''])
 test('process005', normal, compile_and_run, [''])
 test('process006', normal, compile_and_run, [''])
diff --git a/tests/process004.stderr-mingw32 b/tests/process004.stderr-mingw32
deleted file mode 100644
index 498c00a..0000000
--- a/tests/process004.stderr-mingw32
+++ /dev/null
@@ -1 +0,0 @@
-process004.exe: true: runInteractiveProcess: invalid argument (Invalid argument)
diff --git a/tests/process004.stdout-mingw32 b/tests/process004.stdout-mingw32
index 358a68f..e9e0e0c 100644
--- a/tests/process004.stdout-mingw32
+++ b/tests/process004.stdout-mingw32
@@ -1,3 +1,2 @@
 Exc: true: runInteractiveProcess: invalid argument (Invalid argument)
 Exc: true: runProcess: invalid argument (Invalid argument)
-





More information about the ghc-commits mailing list