[commit: ghc] master: Testsuite: don't skip concio001 and concio001_thr (c92cfbc)

git at git.haskell.org git at git.haskell.org
Tue May 17 16:03:18 UTC 2016


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

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

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

commit c92cfbce82e69a785951616e5918a90f221bb7a1
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Apr 25 20:33:52 2016 +0200

    Testsuite: don't skip concio001 and concio001_thr
    
    I think they were skipped before because they write to the same output
    file (concio001). This is no longer a problem.


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

c92cfbce82e69a785951616e5918a90f221bb7a1
 libraries/base/tests/IO/Makefile | 4 ++--
 libraries/base/tests/IO/all.T    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/base/tests/IO/Makefile b/libraries/base/tests/IO/Makefile
index 9d5089d..d1a9402 100644
--- a/libraries/base/tests/IO/Makefile
+++ b/libraries/base/tests/IO/Makefile
@@ -7,11 +7,11 @@ include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
 test.concio001:
-	$(TEST_HC) $(TEST_HC_OPTS) --make -fforce-recomp -v0 concio001 -o concio001 
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make -fforce-recomp -v0 concio001 -o concio001 
 	(sleep 1; echo x) | ./concio001
 
 test.concio001.thr:
-	$(TEST_HC) $(TEST_HC_OPTS) --make -fforce-recomp -v0 -threaded concio001 -o concio001 
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make -fforce-recomp -v0 -threaded concio001 -o concio001 
 	(sleep 1; echo x) | ./concio001
 
 # NB. utf8-test should *not* have a final newline.  The last char should be 'X'.
diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T
index 396e9b7..d04f3c4 100644
--- a/libraries/base/tests/IO/all.T
+++ b/libraries/base/tests/IO/all.T
@@ -107,8 +107,8 @@ test('countReaders001',
       extra_clean(['countReaders001.txt']),
       compile_and_run, [''])
 
-test('concio001', skip, run_command, ['$MAKE -s --no-print-directory test.concio001'])
-test('concio001.thr', skip, run_command, ['$MAKE -s --no-print-directory test.concio001.thr'])
+test('concio001', normal, run_command, ['$MAKE -s --no-print-directory test.concio001'])
+test('concio001.thr', normal, run_command, ['$MAKE -s --no-print-directory test.concio001.thr'])
 
 test('concio002', reqlib('process'), compile_and_run, [''])
 



More information about the ghc-commits mailing list