[commit: testsuite] master: use "-osuf p.o" instead of "-osuf p_o", to test #5554 (2a62681)

Simon Marlow marlowsd at gmail.com
Tue Oct 18 17:28:09 CEST 2011


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2a6268143d8905125482b68a1b62503edeb546c8

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

commit 2a6268143d8905125482b68a1b62503edeb546c8
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Oct 18 13:18:05 2011 +0100

    use "-osuf p.o" instead of "-osuf p_o", to test #5554

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

 tests/th/Makefile |    4 ++--
 tests/th/all.T    |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/th/Makefile b/tests/th/Makefile
index dc60d5b..1e35cec 100644
--- a/tests/th/Makefile
+++ b/tests/th/Makefile
@@ -12,8 +12,8 @@ T2386:
 HC_OPTS = -XTemplateHaskell -package template-haskell
 
 TH_spliceE5_prof::
-	$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.p_o 
+	$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.p.o 
 	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -c
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf p_o -o $@
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf p.o -o $@
 	./$@
 
diff --git a/tests/th/all.T b/tests/th/all.T
index 1adf313..a16f7c5 100644
--- a/tests/th/all.T
+++ b/tests/th/all.T
@@ -43,14 +43,14 @@ test('TH_NestedSplices',
 
 # Testing profiling with TH is a bit tricky; we've already disabled
 # the prof way above, and also we want to add options specifically for
-# profiling (-osuf p_o) because this is necessary when mixing
+# profiling (-osuf p.o) because this is necessary when mixing
 # profiling w/ TH.  Furthermore we must have built the program the
 # normal way first, which is why the work is done by a Makefile rule.
 test('TH_spliceE5_prof',
      [req_profiling,
       omit_ways(['ghci']),
-      extra_clean(['TH_spliceE5_prof_Lib.p_o', 'TH_spliceE5_prof_Lib.hi',
-                   'TH_spliceE5_prof_Lib.o','TH_spliceE5_prof.p_o'])],
+      extra_clean(['TH_spliceE5_prof_Lib.p.o', 'TH_spliceE5_prof_Lib.hi',
+                   'TH_spliceE5_prof_Lib.o','TH_spliceE5_prof.p.o'])],
      run_command,
      ['$MAKE -s --no-print-directory TH_spliceE5_prof'])
 





More information about the Cvs-ghc mailing list