diff --git a/rts/IOManager.c b/rts/IOManager.c
index e05c099047fec4a3099a63d86cedcfb21c9ac09b..4f53245dad6456d6ffff2ef6ba2c8c83206218a3 100644
--- a/rts/IOManager.c
+++ b/rts/IOManager.c
@@ -364,7 +364,7 @@ void initIOManager(void)
* TODO: rationalise this into one entry point, that internally
* can do different things in the two cases.
*/
-#if defined (THREADED_RTS)
+#if defined(THREADED_RTS)
/* Win32 implementation in win32/ThrIOManager.c
*/
ioManagerStart();
diff --git a/rts/Updates.h b/rts/Updates.h
index 9bdc9d72c0a18a15382bf2e063cfcd4f5d5cf78d..7df978e96cf62c2407aa9414bb0eb78dd8655a3e 100644
--- a/rts/Updates.h
+++ b/rts/Updates.h
@@ -9,8 +9,8 @@
#pragma once
#if !defined(CMINUSMINUS)
-#include "BeginPrivate.h"
#include "RtsFlags.h"
+#include "BeginPrivate.h"
#endif
diff --git a/testsuite/tests/bytecode/T24634/Makefile b/testsuite/tests/bytecode/T24634/Makefile
index b6bf36cc8c028e7ec9702d99d2368c31744b46e5..b08d2225048e9578f6a53122b8bc81328e3ed788 100644
--- a/testsuite/tests/bytecode/T24634/Makefile
+++ b/testsuite/tests/bytecode/T24634/Makefile
@@ -4,14 +4,14 @@ include $(TOP)/mk/test.mk
# This case loads bytecode from the interface file written in the second invocation.
T24634a:
- $(TEST_HC) -c hello_c.c -o hello_c.o
- $(TEST_HC) -c -fbyte-code-and-object-code -fno-omit-interface-pragmas Hello.hs
- $(TEST_HC) -fprefer-byte-code -fbyte-code-and-object-code -fno-ignore-interface-pragmas hello_c.o Main.hs
+ '$(TEST_HC)' -c hello_c.c -o hello_c.o
+ '$(TEST_HC)' -c -fbyte-code-and-object-code -fno-omit-interface-pragmas Hello.hs
+ '$(TEST_HC)' -fprefer-byte-code -fbyte-code-and-object-code -fno-ignore-interface-pragmas hello_c.o Main.hs
./Main
# This case uses the bytecode generated in 'runHscBackendPhase', not involving the interface, since 'Hello' is compiled
# in the same invocation as 'Main'.
T24634b:
- $(TEST_HC) -c hello_c.c -o hello_c.o
- $(TEST_HC) -fprefer-byte-code -fbyte-code-and-object-code -fno-ignore-interface-pragmas hello_c.o Hello.hs Main.hs
+ '$(TEST_HC)' -c hello_c.c -o hello_c.o
+ '$(TEST_HC)' -fprefer-byte-code -fbyte-code-and-object-code -fno-ignore-interface-pragmas hello_c.o Hello.hs Main.hs
./Main
diff --git a/testsuite/tests/bytecode/T25090/Makefile b/testsuite/tests/bytecode/T25090/Makefile
index 41c71bfbc4251c1ffac78a6e5a464ab09098ee78..8729cfc5e1054bc1a3cfe7286480b46362725e3a 100644
--- a/testsuite/tests/bytecode/T25090/Makefile
+++ b/testsuite/tests/bytecode/T25090/Makefile
@@ -4,18 +4,18 @@ include $(TOP)/mk/test.mk
# Verify that the object files aren't linked by clobbering them.
T25090a:
- $(TEST_HC) -c -fbyte-code-and-object-code C.hs-boot
- $(TEST_HC) -c -fbyte-code-and-object-code B.hs
- $(TEST_HC) -c -fbyte-code-and-object-code C.hs
+ '$(TEST_HC)' -c -fbyte-code-and-object-code C.hs-boot
+ '$(TEST_HC)' -c -fbyte-code-and-object-code B.hs
+ '$(TEST_HC)' -c -fbyte-code-and-object-code C.hs
echo 'corrupt' > B.o
echo 'corrupt' > C.o
echo 'corrupt' > C.o-boot
- $(TEST_HC) -c -fbyte-code-and-object-code D.hs
+ '$(TEST_HC)' -c -fbyte-code-and-object-code D.hs
echo 'corrupt' > D.o
- $(TEST_HC) -c -fbyte-code-and-object-code -fprefer-byte-code A.hs
- $(TEST_HC) -fbyte-code-and-object-code -fprefer-byte-code A.o -o exe
+ '$(TEST_HC)' -c -fbyte-code-and-object-code -fprefer-byte-code A.hs
+ '$(TEST_HC)' -fbyte-code-and-object-code -fprefer-byte-code A.o -o exe
./exe
T25090b:
- $(TEST_HC) -fbyte-code-and-object-code -fprefer-byte-code A -o exe -v0
+ '$(TEST_HC)' -fbyte-code-and-object-code -fprefer-byte-code A -o exe -v0
./exe
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile
index 156fc0b58c020e33590919daf32e54df56c0390d..c3cc7029d3c76443848ea93223405b7c791f8a57 100644
--- a/testsuite/tests/driver/Makefile
+++ b/testsuite/tests/driver/Makefile
@@ -788,7 +788,7 @@ T22044:
.PHONY: T22669
T22669:
- echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --interactive T22669
+ echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) T22669
! test -f T22669.o-boot
diff --git a/testsuite/tests/driver/boot-target/Makefile b/testsuite/tests/driver/boot-target/Makefile
index d9404ccc8c1c77ad1c3c104d221f23bdcbc52521..b153e4a135e728564e9b0b5f2b30a48f6eba4603 100644
--- a/testsuite/tests/driver/boot-target/Makefile
+++ b/testsuite/tests/driver/boot-target/Makefile
@@ -1,8 +1,8 @@
boot1:
- $(TEST_HC) -c A.hs-boot B.hs
+ '$(TEST_HC)' -c A.hs-boot B.hs
boot2:
- $(TEST_HC) A.hs-boot A.hs B.hs -v0
+ '$(TEST_HC)' A.hs-boot A.hs B.hs -v0
boot3:
- $(TEST_HC) A.hs-boot B.hs -v0
\ No newline at end of file
+ '$(TEST_HC)' A.hs-boot B.hs -v0
diff --git a/testsuite/tests/driver/fat-iface/Makefile b/testsuite/tests/driver/fat-iface/Makefile
index e74578a491345ea5c950ad613e906ce96f65e071..18ef6c60fee9e0465b909ba90008fed73137b48a 100644
--- a/testsuite/tests/driver/fat-iface/Makefile
+++ b/testsuite/tests/driver/fat-iface/Makefile
@@ -55,5 +55,5 @@ T22807: clean
T22807_ghci: clean
"$(TEST_HC)" $(TEST_HC_OPTS) T22807_ghci.hs -fno-full-laziness -fhide-source-paths -fwrite-if-simplified-core -O2 -dynamic -v0
- "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --interactive -fhide-source-paths -fno-full-laziness < T22807_ghci.script
+ "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -fhide-source-paths -fno-full-laziness < T22807_ghci.script
diff --git a/testsuite/tests/linters/regex-linters/check-cpp.py b/testsuite/tests/linters/regex-linters/check-cpp.py
index 4cc2257984154b0269eb8db45d2f0246b1a5c883..fa215e17974c12b5d134595971343cc1c1fd917f 100644
--- a/testsuite/tests/linters/regex-linters/check-cpp.py
+++ b/testsuite/tests/linters/regex-linters/check-cpp.py
@@ -13,12 +13,12 @@ linters = [
message='CPP macros should not have a space between the macro name and their argument list'),
RegexpLinter(r'ASSERT2\s+\(',
message='CPP macros should not have a space between the macro name and their argument list'),
- RegexpLinter(r'#ifdef\s+',
- message='`#if defined(x)` is preferred to `#ifdef x`'),
+ # RegexpLinter(r'#ifdef\s+',
+ # message='`#if defined(x)` is preferred to `#ifdef x`'),
RegexpLinter(r'#if\s+defined\s+',
message='`#if defined(x)` is preferred to `#if defined x`'),
- RegexpLinter(r'#ifndef\s+',
- message='`#if !defined(x)` is preferred to `#ifndef x`'),
+ # RegexpLinter(r'#ifndef\s+',
+ # message='`#if !defined(x)` is preferred to `#ifndef x`'),
]
for l in linters:
diff --git a/testsuite/tests/perf/compiler/Makefile b/testsuite/tests/perf/compiler/Makefile
index e7775ebd9e51a838f154b3426483e1ba947aa023..bfa4b2addfa5a8f33d16cd85a3f8ddbbbe25418b 100644
--- a/testsuite/tests/perf/compiler/Makefile
+++ b/testsuite/tests/perf/compiler/Makefile
@@ -21,7 +21,7 @@ MultiModulesRecomp:
# containing core expressions, aka `mi_extra_decls` are populated.
MultiModulesRecompDefsWithCore:
./genMultiLayerModulesCore
- '$(TEST_HC)' --interactive $(TEST_HC_OPTS) -e "" -fwrite-if-simplified-core MultiLayerModules
+ '$(TEST_HC)' $(TEST_HC_OPTS_INTERACTIVE) -e "" -fwrite-if-simplified-core MultiLayerModules
MultiModulesDefsWithCore:
./genMultiLayerModulesCore