[commit: ghc] master: Fix ffi023 (9a20379)

[git at git.haskell.org]

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

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

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

commit 9a20379ee2305b5a74ad982585d46680f2b3439f
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Nov 18 15:40:45 2014 +0000

    Fix ffi023


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

9a20379ee2305b5a74ad982585d46680f2b3439f
 testsuite/tests/ffi/should_run/Makefile | 3 +++
 testsuite/tests/ffi/should_run/all.T    | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/ffi/should_run/Makefile b/testsuite/tests/ffi/should_run/Makefile
index 12e51b2..98d26fe 100644
--- a/testsuite/tests/ffi/should_run/Makefile
+++ b/testsuite/tests/ffi/should_run/Makefile
@@ -20,6 +20,9 @@ T5402_setup :
 T5594_setup :
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5594.hs
 
+ffi023_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c ffi023.hs
+
 .PHONY: Capi_Ctype_001
 Capi_Ctype_001:
 	'$(HSC2HS)' Capi_Ctype_A_001.hsc
diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index 0499631..0352f31 100644
--- a/testsuite/tests/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
@@ -211,5 +211,9 @@ test('T8083',
 
 test('ffi023', [ omit_ways(['ghci']),
                 extra_clean(['ffi023_c.o']),
-                extra_run_opts('1000 4') ],
+                extra_run_opts('1000 4'),
+                pre_cmd('$MAKE -s --no-print-directory ffi023_setup') ],
+                # The ffi023_setup hack is to ensure that we generate
+                # ffi023_stub.h before compiling ffi023_c.c, which
+                # needs it.
               compile_and_run, ['ffi023_c.c'])