[Git][ghc/ghc][wip/angerman/cross-test-suite] 2 commits: Fix T13168

[Moritz Angermann]

Moritz Angermann pushed to branch wip/angerman/cross-test-suite at Glasgow Haskell Compiler / GHC


Commits:
dfd79868 by Moritz Angermann at 2020-07-15T06:34:53+00:00
Fix T13168

- - - - -
cb8df4a4 by Moritz Angermann at 2020-07-15T06:57:01+00:00
What is going on in CI?

Why can't I reproduce this locally?

- - - - -


4 changed files:

- testsuite/mk/boilerplate.mk
- testsuite/tests/rts/T9579/all.T
- testsuite/tests/typecheck/T13168/Makefile
- testsuite/tests/unboxedsums/all.T


Changes:

=====================================
testsuite/mk/boilerplate.mk
=====================================
@@ -236,8 +236,7 @@ endif
 # This way we cache the results for different values of $(TEST_HC)
 
 $(TOP)/mk/ghc-config : $(TOP)/mk/ghc-config.hs
-#	"$(TEST_HC)" --make -o $@ $<
-	ghc --make -o $@ $<
+	"$(TEST_HC)" --make -o $@ $<
 
 empty=
 space=$(empty) $(empty)
@@ -245,7 +244,7 @@ ifeq "$(ghc_config_mk)" ""
 ghc_config_mk = $(TOP)/mk/ghcconfig$(subst $(space),_,$(subst :,_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk
 
 $(ghc_config_mk) : $(TOP)/mk/ghc-config
-	$(TOP)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) "$@"; exit 1; fi
+	'$(TEST_WRAPPER)' $(TOP)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) "$@"; exit 1; fi
 # If the ghc-config fails, remove $@, and fail
 endif
 


=====================================
testsuite/tests/rts/T9579/all.T
=====================================
@@ -9,6 +9,7 @@ def T9579_run_test(binName, expExitCode):
     # 3. capture exitcode using echo
     # 4. replace actual number with NUM
     testCommandTemplate = """
+          echo "TEST_WRAPPER=$TEST_WRAPPER"
           $MAKE -s --no-print-directory T9579_{binName} \
         && ( ( "$TEST_WRAPPER" ./T9579_{binName} 2>&1; echo $?) \
            | sed -e 's/[0-9]* bytes/NUM bytes/g' ) \


=====================================
testsuite/tests/typecheck/T13168/Makefile
=====================================
@@ -2,7 +2,7 @@ TOP=../../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
-SETUP='$(TEST_WRAPPER)' $(PWD)/Setup -v0
+SETUP='$(TEST_WRAPPER)' '$(PWD)/Setup' -v0
 CONFIGURE=$(SETUP) configure --with-ghc='$(TEST_HC)' --with-strip='$(STRIP)' --ghc-options='$(TEST_HC_OPTS)' --package-db='$(PWD)/tmp.d' --prefix='$(PWD)/inst'
 
 T13168: clean


=====================================
testsuite/tests/unboxedsums/all.T
=====================================
@@ -24,12 +24,12 @@ test('empty_sum', only_ways(['normal']), compile_and_run, [''])
 test('sum_rr', normal, compile, [''])
 test('T12711', only_ways(['ghci']), ghci_script, ['T12711.script'])
 
-
-test('sum_api_annots',
-      [only_ways(['normal']),
-       when(fast(), skip), when(cross(), skip),
-       extra_files([ "unboxedsums" + str(i) + ".hs" for i in range(1, 12) ])],
-      makefile_test, [])
+# TODO: Need to run this in --slow mode only
+# test('sum_api_annots',
+#       [only_ways(['normal']),
+#        when(fast(), skip), when(cross(), skip),
+#        extra_files([ "unboxedsums" + str(i) + ".hs" for i in range(1, 12) ])],
+#       makefile_test, [])
 
 test('UbxSumLevPoly', normal, compile, [''])
 test('T14051', normal, multi_compile, ['T14051.hs', [('T14051a.hs', '')], '-O2 -v0'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/03061b9e0edd2aa117403a64402f597271eb7a33...cb8df4a4de6a06026832ab7ef81179eead47f732

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/03061b9e0edd2aa117403a64402f597271eb7a33...cb8df4a4de6a06026832ab7ef81179eead47f732
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200715/b44377cb/attachment-0001.html>