[commit: testsuite] master: Fix qq00{7,8} with dynamic ghc (2e7b17e)

Ian Lynagh igloo at earth.li
Sun Jun 16 21:44:30 CEST 2013


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

On branch  : master

https://github.com/ghc/testsuite/commit/2e7b17e1c4982d5ea5352d7aad71d71f4c12f401

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

commit 2e7b17e1c4982d5ea5352d7aad71d71f4c12f401
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Jun 16 16:46:17 2013 +0100

    Fix qq00{7,8} with dynamic ghc
    
    Untested, but I think they should pass for the profiling ways too now,
    so those ways are no longer omitted.

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

 tests/quasiquotation/qq007/Makefile |    9 +++++++++
 tests/quasiquotation/qq007/test.T   |    5 +----
 tests/quasiquotation/qq008/Makefile |    9 +++++++++
 tests/quasiquotation/qq008/test.T   |    5 +----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/tests/quasiquotation/qq007/Makefile b/tests/quasiquotation/qq007/Makefile
index 9101fbd..e31a732 100644
--- a/tests/quasiquotation/qq007/Makefile
+++ b/tests/quasiquotation/qq007/Makefile
@@ -1,3 +1,12 @@
 TOP=../../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
+
+.PHONY: TH_QQ
+TH_QQ:
+ifeq "$(GhcDynamic)" "YES"
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c QQ.hs -dynamic -osuf dyn_o -hisuf dyn_hi
+else
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c QQ.hs
+endif
+
diff --git a/tests/quasiquotation/qq007/test.T b/tests/quasiquotation/qq007/test.T
index 61374e5..cf59e4f 100644
--- a/tests/quasiquotation/qq007/test.T
+++ b/tests/quasiquotation/qq007/test.T
@@ -1,10 +1,7 @@
 test('qq007',
      [when(fast(), skip),
       extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
-      # We'd need to jump through some hoops to run this test the
-      # profiling ways, due to the TH use, so for now we just
-      # omit the profiling ways
-      omit_ways(['profasm','profthreaded']),
+      pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
       only_compiler_types(['ghc'])],
      multimod_compile,
      ['Test', '-v0'])
diff --git a/tests/quasiquotation/qq008/Makefile b/tests/quasiquotation/qq008/Makefile
index 9101fbd..e31a732 100644
--- a/tests/quasiquotation/qq008/Makefile
+++ b/tests/quasiquotation/qq008/Makefile
@@ -1,3 +1,12 @@
 TOP=../../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
+
+.PHONY: TH_QQ
+TH_QQ:
+ifeq "$(GhcDynamic)" "YES"
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c QQ.hs -dynamic -osuf dyn_o -hisuf dyn_hi
+else
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c QQ.hs
+endif
+
diff --git a/tests/quasiquotation/qq008/test.T b/tests/quasiquotation/qq008/test.T
index 5d41999..99fef71 100644
--- a/tests/quasiquotation/qq008/test.T
+++ b/tests/quasiquotation/qq008/test.T
@@ -1,10 +1,7 @@
 test('qq008',
      [when(fast(), skip),
       extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
-      # We'd need to jump through some hoops to run this test the
-      # profiling ways, due to the TH use, so for now we just
-      # omit the profiling ways
-      omit_ways(['profasm','profthreaded']),
+      pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
       only_compiler_types(['ghc'])],
      multimod_compile,
      ['Test', '-v0'])





More information about the ghc-commits mailing list