aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/ghc-testsuite-grep-compat.patch
blob: a2bd5fcec42bf8e5b65fdceb59e7973239ad9601 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
Remove stray escapes to avoid warnings from grep 3.8 which breaks
expected test output.

diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
--- a/testsuite/tests/hsc2hs/Makefile
+++ b/testsuite/tests/hsc2hs/Makefile
@@ -47,5 +47,5 @@ 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
diff --git a/testsuite/tests/numeric/should_run/T7014.primops b/testsuite/tests/numeric/should_run/T7014.primops
--- 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
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -226,7 +226,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.
g-tooltip'>* gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): Update to 0.20.0. Signed-off-by: Andrew Tropin <andrew@trop.in> Hilton Chain 2023-10-20gnu: tree-sitter-bash: Update to 0.20.4....* gnu/packages/tree-sitter.scm (tree-sitter-bash): Update to 0.20.4. Signed-off-by: Andrew Tropin <andrew@trop.in> Hilton Chain 2023-10-20gnu: tree-sitter: Update to 0.20.10....* gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.10. (tree-sitter-cli)[arguments]<#:cargo-test-flags>: Skip github_issue_test. <#:cargo-inputs>: Add rust-path-slash-0.2. Signed-off-by: Andrew Tropin <andrew@trop.in> Hilton Chain 2023-10-08gnu: Add tree-sitter-scala....* gnu/packages/tree-sitter.scm (tree-sitter-scala): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Karl Hallsby 2023-10-08gnu: Add tree-sitter-lua....* gnu/packages/tree-sitter.scm (tree-sitter-lua): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> john muhl 2023-10-05gnu: tree-sitter-java: Update to 0.20.1....* gnu/packages/tree-sitter.scm (tree-sitter-java): Update to 0.20.1. Signed-off-by: Andrew Tropin <andrew@trop.in> Kjartan Oli Agustsson 2023-09-01gnu: Add tree-sitter-plantuml....* gnu/packages/tree-sitter.scm (tree-sitter-plantuml): New variable. Andrew Tropin 2023-09-01gnu: tree-sitter-grammar: Add get-cleanup-snippet argument....* gnu/packages/tree-sitter.scm (tree-sitter-grammar): Add get-cleanup-snippet argument. Andrew Tropin 2023-08-27gnu: Add tree-sitter-cmake....* gnu/packages/tree-sitter.scm (tree-sitter-cmake): New variable. Hilton Chain 2023-08-20gnu: Add tree-sitter-meson....* gnu/packages/tree-sitter.scm (tree-sitter-meson): New variable. Signed-off-by: Hilton Chain <hako@ultrarare.space> Zheng Junjie 2023-08-20gnu: Add tree-sitter-dockerfile....* gnu/packages/tree-sitter.scm (tree-sitter-dockerfile): New variable. Hilton Chain