[Git][ghc/ghc][master] 2 commits: testsuite/GHCiPrimCall : Add missing Makefile includes

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
a249649b by Ben Gamari at 2024-11-22T23:35:51-05:00
testsuite/GHCiPrimCall : Add missing Makefile includes

- - - - -
a021a493 by Ben Gamari at 2024-11-22T23:35:51-05:00
testsuite/IpeStats: Use Make rather than shell interpolation

- - - - -


2 changed files:

- testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile
- testsuite/tests/rts/ipe/IpeStats/Makefile


Changes:

=====================================
testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile
=====================================
@@ -1,3 +1,7 @@
+TOP=../../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
 .PHONY: GHCiPrimCall
 GHCiPrimCall:
 	'$(TEST_HC)' $(TEST_HC_OPTS) -fPIC -v0 -c GHCiPrimCall_cmm.cmm


=====================================
testsuite/tests/rts/ipe/IpeStats/Makefile
=====================================
@@ -22,16 +22,16 @@ SKIPPED_SELECTOR := 'Tables skipped: [0-9]+'
 # statistics.
 
 ipe_stats:
-	@NoOmit="$$($$TEST_HC $$TEST_HC_OPTS -fforce-recomp -finfo-table-map -dipe-stats Fold.hs)" ; \
+	@NoOmit="$$('$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -finfo-table-map -dipe-stats Fold.hs)" ; \
 	Stack=$$(echo $$NoOmit | grep -Eo $(STACK_SELECTOR) | grep -Eo '[0-9]+$$') ; \
 	Fallback=$$(echo $$NoOmit | grep -Eo $(FALLBACK_SELECTOR) | grep -Eo '[0-9]+$$') ; \
 	Skipped=$$(echo $$NoOmit | grep -Eo $(SKIPPED_SELECTOR) | grep -Eo '[0-9]+$$') ; \
 	Both=$$(expr $$Stack + $$Fallback) ; \
-	OmitStack="$$($$TEST_HC $$TEST_HC_OPTS -fforce-recomp -finfo-table-map -fno-info-table-map-with-stack -dipe-stats Fold.hs)" ; \
+	OmitStack="$$('$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -finfo-table-map -fno-info-table-map-with-stack -dipe-stats Fold.hs)" ; \
 	SkippedStack=$$(echo $$OmitStack | grep -Eo $(SKIPPED_SELECTOR) | grep -Eo '[0-9]+$$') ; \
-	OmitFallback="$$($$TEST_HC $$TEST_HC_OPTS -fforce-recomp -finfo-table-map -fno-info-table-map-with-fallback -dipe-stats Fold.hs)" ; \
+	OmitFallback="$$('$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -finfo-table-map -fno-info-table-map-with-fallback -dipe-stats Fold.hs)" ; \
 	SkippedFallback=$$(echo $$OmitFallback| grep -Eo $(SKIPPED_SELECTOR) | grep -Eo '[0-9]+$$') ; \
-	OmitBoth="$$($$TEST_HC $$TEST_HC_OPTS -fforce-recomp -finfo-table-map -fno-info-table-map-with-stack -fno-info-table-map-with-fallback -dipe-stats Fold.hs)" ; \
+	OmitBoth="$$('$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -finfo-table-map -fno-info-table-map-with-stack -fno-info-table-map-with-fallback -dipe-stats Fold.hs)" ; \
 	SkippedBoth=$$(echo $$OmitBoth| grep -Eo $(SKIPPED_SELECTOR) | grep -Eo '[0-9]+$$') ; \
 	echo "Baseline number of skipped tables: $$Skipped\n" ; \
 	echo "Baseline number of stack tables:                                  $$Stack" ; \



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/454ce95735f1b275a4774c7b3b5e2cd773639922...a021a4934dd6792a0d3ac614416a2db4ce265350

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/454ce95735f1b275a4774c7b3b5e2cd773639922...a021a4934dd6792a0d3ac614416a2db4ce265350
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/20241122/44facce7/attachment-0001.html>