--- ghc-9.2.5/testsuite/tests/numeric/should_run/T7014.primops.orig	2023-03-12 14:42:11.338540492 +0100
+++ ghc-9.2.5/testsuite/tests/numeric/should_run/T7014.primops	2023-03-12 14:42:13.735608896 +0100
@@ -1,9 +1,9 @@
 and#
 or#
 uncheckedShift.*#
++#
+-#
+*#
-\+#
-\-#
-\*#
 quotInt#
 remInt#
 plusFloat#
--- ghc-9.2.5/testsuite/tests/hsc2hs/Makefile.orig	2023-03-12 14:40:03.825939306 +0100
+++ ghc-9.2.5/testsuite/tests/hsc2hs/Makefile	2023-03-12 14:40:07.961054835 +0100
@@ -54,7 +54,7 @@
 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
--- ghc-9.2.5/testsuite/tests/simplCore/should_compile/Makefile.orig	2023-03-12 14:41:16.204974035 +0100
+++ ghc-9.2.5/testsuite/tests/simplCore/should_compile/Makefile	2023-03-12 14:41:17.832020067 +0100
@@ -253,7 +253,7 @@
 # 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.
nu/tests/ssh.scm?id=ba1727b0410326d4cd90eb7236d5539abaff8c67'>commit</a><a href='/guix/diff/gnu/tests/ssh.scm?id=ba1727b0410326d4cd90eb7236d5539abaff8c67'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/ssh.scm'>
<input type='hidden' name='id' value='ba1727b0410326d4cd90eb7236d5539abaff8c67'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=ba1727b0410326d4cd90eb7236d5539abaff8c67'>root</a>/<a href='/guix/log/gnu?id=ba1727b0410326d4cd90eb7236d5539abaff8c67'>gnu</a>/<a href='/guix/log/gnu/tests?id=ba1727b0410326d4cd90eb7236d5539abaff8c67'>tests</a>/<a href='/guix/log/gnu/tests/ssh.scm?id=ba1727b0410326d4cd90eb7236d5539abaff8c67'>ssh.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests/ssh.scm?id=ba1727b0410326d4cd90eb7236d5539abaff8c67&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-04-21 16:33:21 +0200'>2020-04-21</span></td><td><a href='/guix/commit/gnu/tests/ssh.scm?id=a295a1ca2942794ac52321a639128f94be595ac5'>tests: ssh: Explicitly wait for port 22.</a><span class='msg-avail'>...</span><<tr><td><span title='2020-09-28 21:<tr><td><span title='2019-05-09 12:11:36 +0200'>2019-05-09</span></td><td><a href='/guix/commit/gnu/tests/ssh.scm?id=e6b1a2248ff164e14d1b2f495224faf8a8326142'>services: Log-in services now require "pam_loginuid".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
020-08-23</span></td><td><a href='/guix/commit/tests/guix-lint.sh?id=d10474c38d58bdc676e64336769dc2e00cdfa8ed'>lint: formatting: Gracefully handle relative file names.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-12-08 23:14:03 +0100'>2019-12-08</span></td><td><a href='/guix/commit/tests/guix-lint.sh?id=7282f9496793227d7ac6f902976aecb663068ec1'>lint: Add '--load-path' option.</a><span class='msg-avail'>...</span></td><td>zimoun</td></tr>