mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
107 lines
5.4 KiB
Diff
107 lines
5.4 KiB
Diff
From f82caac9d8aa6b49551fbde95c60320d00851065 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
|
|
Date: Thu, 3 Nov 2022 19:22:01 +0100
|
|
Subject: [PATCH] testsuite: Make tests compatible with GNU grep >= 3.8
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
grep >= 3.8 warns about stray backslashes in regular expression
|
|
patterns. These warnings are written to stderr and cause errors
|
|
when comparing the actual stderr output with the expected stderr
|
|
output.
|
|
|
|
Similarly, grep also warns about using of egrep/fgrep/…
|
|
---
|
|
testsuite/tests/cabal/cabal01/Makefile | 2 +-
|
|
testsuite/tests/haddock/perf/Makefile | 8 ++++----
|
|
testsuite/tests/hsc2hs/Makefile | 2 +-
|
|
testsuite/tests/numeric/should_run/T7014.primops | 4 ++--
|
|
testsuite/tests/simplCore/should_compile/Makefile | 4 ++--
|
|
5 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
|
|
index 004e4c754e..6ec499c9e1 100644
|
|
--- a/testsuite/tests/cabal/cabal01/Makefile
|
|
+++ b/testsuite/tests/cabal/cabal01/Makefile
|
|
@@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk
|
|
# Find all the env variables starting with CI_ to unset them.
|
|
# Otherwise, we might run into environment length limitations on Windows.
|
|
# (See `xargs --show-limits`.)
|
|
-VARS_TO_UNSET := $(shell env | grep ^CI_ | egrep -o '^[^=]+')
|
|
+VARS_TO_UNSET := $(shell env | grep ^CI_ | grep -E -o '^[^=]+')
|
|
unexport $(VARS_TO_UNSET)
|
|
|
|
clean:
|
|
diff --git a/testsuite/tests/haddock/perf/Makefile b/testsuite/tests/haddock/perf/Makefile
|
|
index b67b52f2e3..ff2f7ebb8e 100644
|
|
--- a/testsuite/tests/haddock/perf/Makefile
|
|
+++ b/testsuite/tests/haddock/perf/Makefile
|
|
@@ -4,12 +4,12 @@ include $(TOP)/mk/test.mk
|
|
|
|
# We accept a 5% increase in parser allocations due to -haddock
|
|
haddock_parser_perf :
|
|
- WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Parser | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
- WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Parser | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
+ WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Parser | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
+ WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Parser | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.05) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }"
|
|
|
|
# Similarly for the renamer
|
|
haddock_renamer_perf :
|
|
- WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
- WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
+ WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Renamer | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
+ WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Renamer | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \
|
|
awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.05) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }"
|
|
diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
|
|
index d0b2d249c3..a266d3d213 100644
|
|
--- a/testsuite/tests/hsc2hs/Makefile
|
|
+++ b/testsuite/tests/hsc2hs/Makefile
|
|
@@ -54,7 +54,7 @@ T12504:
|
|
ifeq "$(WINDOWS)" "YES"
|
|
grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs
|
|
else
|
|
- grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs
|
|
+ grep '{-# LINE 1 "T12504/path/to/$@\.hsc" #-}' T12504/path/to/$@.hs
|
|
endif
|
|
|
|
.PHONY: T15758
|
|
diff --git a/testsuite/tests/numeric/should_run/T7014.primops b/testsuite/tests/numeric/should_run/T7014.primops
|
|
index 3243666dbc..c807fb4559 100644
|
|
--- a/testsuite/tests/numeric/should_run/T7014.primops
|
|
+++ b/testsuite/tests/numeric/should_run/T7014.primops
|
|
@@ -1,8 +1,8 @@
|
|
and#
|
|
or#
|
|
uncheckedShift.*#
|
|
-\+#
|
|
-\-#
|
|
++#
|
|
+-#
|
|
\*#
|
|
quotInt#
|
|
remInt#
|
|
diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
|
|
index b5041800ed..c56e04f6f2 100644
|
|
--- a/testsuite/tests/simplCore/should_compile/Makefile
|
|
+++ b/testsuite/tests/simplCore/should_compile/Makefile
|
|
@@ -66,7 +66,7 @@ T13367:
|
|
|
|
T8832:
|
|
$(RM) -f T8832.o T8832.hi
|
|
- '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | egrep '^[a-zA-Z0-9]+ ='
|
|
+ '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | grep -E '^[a-zA-Z0-9]+ ='
|
|
|
|
T12603:
|
|
$(RM) -f T12603.o T12603.hi
|
|
@@ -259,7 +259,7 @@ str-rules:
|
|
# g should have been collapsed into one defininition by CSE.
|
|
.PHONY: T13340
|
|
T13340:
|
|
- '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '\+#'
|
|
+ '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '+#'
|
|
|
|
|
|
# We expect to see all dictionaries specialized away.
|