diff options
| author | Tamar Christina <tamar@zhox.com> | 2016-05-21 10:23:59 -0400 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2016-05-21 18:47:13 +0200 |
| commit | a1f3bb8ca454f05fa35cb6b5c64e92f640380802 (patch) | |
| tree | 0d92adb108191481cebf93f57f8fe6ba1ff63950 | |
| parent | 8e929744eb332eed878aa2b334beea435d30ddfd (diff) | |
| download | haskell-a1f3bb8ca454f05fa35cb6b5c64e92f640380802.tar.gz | |
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
| -rw-r--r-- | libraries/base/tests/IO/T12010/Makefile | 7 | ||||
| -rw-r--r-- | libraries/base/tests/IO/T12010/T12010.stdout | 2 | ||||
| -rw-r--r-- | 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 112e1f19fc..b924de29ae 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 dec7b86bee..0000000000 --- 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 178814fff3..ecf48284fa 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']) |