[commit: packages/process] master: GH77: fix tests (eb85aac)

git at git.haskell.org git at git.haskell.org
Wed Jul 19 21:18:14 UTC 2017


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

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

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

commit eb85aacbd1f58655ae74c920b1b3208f8ce7ba94
Author: Tamar Christina <tamar at zhox.com>
Date:   Sun Dec 11 12:01:03 2016 +0000

    GH77: fix tests


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

eb85aacbd1f58655ae74c920b1b3208f8ce7ba94
 tests/T9775/Makefile |  2 +-
 tests/T9775/all.T    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/T9775/Makefile b/tests/T9775/Makefile
index 6eafccf..f5a54bc 100644
--- a/tests/T9775/Makefile
+++ b/tests/T9775/Makefile
@@ -2,7 +2,7 @@
 # assumes the package is part of a GHC build tree with the testsuite
 # installed in ../../../testsuite.
 
-TOP=../../../testsuite
+TOP=../../../../testsuite
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
diff --git a/tests/T9775/all.T b/tests/T9775/all.T
index 694c0c8..55e7750 100644
--- a/tests/T9775/all.T
+++ b/tests/T9775/all.T
@@ -1,12 +1,14 @@
 
 test('T9775_fail',
      [extra_clean(['ok.o', 'ok.exe', 'main.o', 'main.exe']),
-     [unless(opsys('mingw32'),skip)],
+      extra_files(['ok.c', 'main.c']),
+      unless(opsys('mingw32'),skip),
       pre_cmd('$MAKE -s --no-print-directory T9775')],
-     compile_and_run, [''])
+      compile_and_run, [''])
 
 test('T9775_good',
      [extra_clean(['ok.o', 'ok.exe', 'main.o', 'main.exe']),
-     [unless(opsys('mingw32'),skip)],
+      unless(opsys('mingw32'),skip),
+      extra_files(['ok.c', 'main.c']),
       pre_cmd('$MAKE -s --no-print-directory T9775')],
-     compile_and_run, [''])
+      compile_and_run, [''])



More information about the ghc-commits mailing list