[commit: ghc] ghc-8.0: Fix failing T12010 (a81801f)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/a81801f90a4af84a8196fb56eaadffbc4a331f5c/ghc

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

commit a81801f90a4af84a8196fb56eaadffbc4a331f5c
Author: Tamar Christina <tamar at zhox.com>
Date:   Sat May 21 10:23:59 2016 -0400

    Fix failing T12010
    
    Summary:
    T12010 seems to be failing because it can't find the correct paths.
    This gives the test some more qualified paths.
    
    Test Plan: make TEST=12010
    
    Reviewers: hvr, bgamari, austin, thomie
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D2252
    
    GHC Trac Issues: #12010
    
    (cherry picked from commit a1f3bb8ca454f05fa35cb6b5c64e92f640380802)


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

a81801f90a4af84a8196fb56eaadffbc4a331f5c
 libraries/base/tests/IO/T12010/Makefile      | 7 ++++---
 libraries/base/tests/IO/T12010/T12010.stdout | 2 --
 libraries/base/tests/IO/T12010/test.T        | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/base/tests/IO/T12010/Makefile b/libraries/base/tests/IO/T12010/Makefile
index 112e1f1..b924de2 100644
--- a/libraries/base/tests/IO/T12010/Makefile
+++ b/libraries/base/tests/IO/T12010/Makefile
@@ -1,10 +1,11 @@
 TOP=../../../../../testsuite
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
+TESTDIR=$(TOP)/../libraries/base/tests/IO/T12010
 
 .PHONY: T12010
 T12010:
-	'$(HSC2HS)' -I ../../../include/ -I ../../../../../includes/ T12010.hsc
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(WAY_FLAGS) -c cbits/initWinSock.c
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(WAY_FLAGS) -fno-warn-unsupported-calling-conventions cbits/initWinSock.o T12010.hs
+	'$(HSC2HS)' -I $(TOP)/../libraries/base/include/ -I $(TOP)/../includes/ T12010.hsc
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(WAY_FLAGS) -c $(TESTDIR)/cbits/initWinSock.c
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(WAY_FLAGS) -fno-warn-unsupported-calling-conventions $(TESTDIR)/cbits/initWinSock.o $(TESTDIR)/T12010.hs
 	./T12010
diff --git a/libraries/base/tests/IO/T12010/T12010.stdout b/libraries/base/tests/IO/T12010/T12010.stdout
deleted file mode 100644
index dec7b86..0000000
--- a/libraries/base/tests/IO/T12010/T12010.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-[1 of 1] Compiling Main             ( T12010.hs, T12010.o )
-Linking T12010 ...
diff --git a/libraries/base/tests/IO/T12010/test.T b/libraries/base/tests/IO/T12010/test.T
index 178814f..ecf4828 100644
--- a/libraries/base/tests/IO/T12010/test.T
+++ b/libraries/base/tests/IO/T12010/test.T
@@ -3,6 +3,8 @@ test('T12010',
         extra_clean(['cbits/initWinSock.o', 'T12010.hi', 'T12010.hs']),
         only_ways(['threaded1']),
         extra_ways(['threaded1']),
+        exit_code(0),
+        ignore_output,
         cmd_prefix('WAY_FLAGS="' + ' '.join(config.way_flags('T12010')['threaded1']) + '"')],
      run_command,
      ['$MAKE -s --no-print-directory T12010'])