From 083871d27c46fdfaa524157a1f38e8064567cebc Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Sun, 18 Aug 2024 04:44:01 +0200
Subject: [PATCH] testsuite: remove undesired -fasm flag from test ways
This patch removes the -fasm flag from test ways, except ways like
optasm that explicitly state they are meant to be compiled with NCG
backend. Most test ways should use the default codegen backend, and
the precense of -fasm can cause stderr mismatches like this when GHC
is configured with the unregisterised backend:
```
--- /dev/null
+++ /tmp/ghctest-3hydwldj/test spaces/testsuite/tests/profiling/should_compile/prof-late-cc.run/prof-late-cc.comp.stderr.normalised
@@ -0,0 +1,2 @@
+when making flags consistent: warning: [GHC-74335] [-Winconsistent-flags (in -Wdefault)]
+ Target platform uses unregisterised ABI, so compiling via C
*** unexpected failure for prof-late-cc(prof_no_auto)
```
This has been breaking the wasm unreg nightly job since !12595 landed.
(cherry picked from commit 8848884718044dbcc08be134d768040ffa18d336)
(cherry picked from commit f603ac9ca9b93f25376bb8fc221d87ccc27bcba6)
---
testsuite/config/ghc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index 01d1fcf14e9..02c76f40180 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -93,8 +93,8 @@ config.way_flags = {
'llvm' : ['-fllvm'],
'optllvm' : ['-O', '-fllvm'],
'debugllvm' : ['-fllvm', '-keep-llvm-files'],
- 'prof' : ['-prof', '-static', '-fprof-auto', '-fasm'],
- 'prof_no_auto' : ['-prof', '-static', '-fasm'],
+ 'prof' : ['-prof', '-static', '-fprof-auto'],
+ 'prof_no_auto' : ['-prof', '-static'],
'profasm' : ['-O', '-prof', '-static', '-fprof-auto'],
'profthreaded' : ['-O', '-prof', '-static', '-fprof-auto', '-threaded'],
'ghci' : ['--interactive', '-fno-unoptimized-core-for-interpreter', '-O0', '-v0', '-ignore-dot-ghci', '-fno-ghci-history', '+RTS', '-I0.1', '-RTS'] + (['-fghci-leak-check'] if not config.compiler_debugged else []),
--
GitLab