GHC 9.10 compat in testsuite: CPP symbols don't get passed to CC as

eagearly

Discussion: haskell#9914 (comment)

Related GHC issue: https://gitlab.haskell.org/ghc/ghc/-/issues/21291

cabal-testsuite/PackageTests/CCompilerOverride/foo.c

@@ -1,16 +1,8 @@
 
-#ifndef NOERROR1
-#error "NOERROR1 was not passed"
-#endif
-
 #ifndef NOERROR2
 #error "NOERROR2 was not passed"
 #endif
 
-#ifndef NOERROR3
-#error "NOERROR3 was not passed"
-#endif
-
 #ifndef NOERROR4
 #error "NOERROR4 was not passed"
 #endif

cabal-testsuite/PackageTests/CCompilerOverride/my.cabal

@@ -9,5 +9,5 @@ executable foo
     main-is:          Main.hs
     c-sources:        foo.c
     build-depends:    base
-    ghc-options:      -DNOERROR4
+    ghc-options:      -optc=-DNOERROR4
     cc-options:       -DNOERROR5 -march=native

cabal-testsuite/PackageTests/CCompilerOverride/setup.out

@@ -1,4 +1,3 @@
 # Setup configure
 Configuring my-0.1...
-Warning: [misplaced-c-opt] Instead of 'ghc-options: -DNOERROR4' use 'cpp-options: -DNOERROR4'
 # Setup build

cabal-testsuite/PackageTests/CCompilerOverride/setup.test.hs

@@ -3,6 +3,10 @@ import Test.Cabal.Prelude
 -- Test that all the respective defines -DNOERROR... specified in various ways
 -- all end up routed to the C compiler. Otherwise the C file we depend on will
 -- not compile.
+--
+-- This has been largely gutted, as ghc 9.10 no longer passes through most
+-- of the defines we were testing; see
+-- https://gitlab.haskell.org/ghc/ghc/-/commit/8ff3134ed4aa323b0199ad683f72165e51a59ab6
 main = setupAndCabalTest $ do
   skipUnlessGhcVersion ">= 8.8"
   isWin <- isWindows
@@ -14,9 +18,7 @@ main = setupAndCabalTest $ do
         pwd ++ "/custom-cc" ++ if isWin then win_suffix else ""
 
   setup "configure"
-    [ "--ghc-option=-DNOERROR1"
-    , "--ghc-option=-optc=-DNOERROR2"
-    , "--ghc-option=-optP=-DNOERROR3"
+    [ "--ghc-option=-optc=-DNOERROR2"
     , "--with-gcc=" ++ customCC
     ]
   setup "build" ["-v2"]