Fix some tests

Author: hsyl20

Cabal-tests/tests/NoThunks.hs

@@ -72,6 +72,7 @@ instance NoThunks ConfVar
 instance NoThunks Dependency
 instance NoThunks Executable
 instance NoThunks ExecutableScope
+instance NoThunks ExtraSource
 instance NoThunks FlagName
 instance NoThunks ForeignLib
 instance NoThunks ForeignLibOption

Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs

@@ -78,6 +78,7 @@ instance ToExpr ExeDependency
 instance ToExpr Executable
 instance ToExpr ExecutableScope
 instance ToExpr ExposedModule
+instance ToExpr ExtraSource
 instance ToExpr FlagAssignment
 instance ToExpr FlagName
 instance ToExpr ForeignLib

cabal-install/tests/IntegrationTests2.hs

@@ -656,7 +656,12 @@ testTargetSelectorAmbiguous reportSubCase = do
 
     withCFiles :: Executable -> [FilePath] -> Executable
     withCFiles exe files =
-      exe{buildInfo = (buildInfo exe){cSources = map unsafeMakeSymbolicPath files}}
+      exe{buildInfo = (buildInfo exe){cSources = map (mkExtraSource . unsafeMakeSymbolicPath) files}}
+
+    mkExtraSource x = ExtraSource
+      { extraSourceFile = x
+      , extraSourceOpts = []
+      }
 
     withHsSrcDirs :: Executable -> [FilePath] -> Executable
     withHsSrcDirs exe srcDirs =