Update the extra-source-files script and list

Include cabal.project files too.
haskell · May 13, 2016 · 6b8b47f · 6b8b47f
1 parent ba50798
commit 6b8b47f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Cabal/misc/gen-extra-source-files.sh b/Cabal/misc/gen-extra-source-files.sh
@@ -9,7 +9,7 @@ fi
 set -ex
 
 git ls-files tests \
-    | awk '/\.(hs|lhs|c|sh|cabal|hsc|err|out|in)$|ghc/ { print } { next }' \
+    | awk '/\.(hs|lhs|c|sh|cabal|hsc|err|out|in|project)$|ghc/ { print } { next }' \
     | awk '/Check.hs$|UnitTests|PackageTester|autogen|register.sh|PackageTests.hs|IntegrationTests.hs|CreatePipe|^tests\/Test/ { next } { print }' \
     | LC_ALL=C sort \
     | sed -e 's/^/  /' \

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -69,6 +69,7 @@ Extra-Source-Files:
   tests/IntegrationTests/freeze/freezes_transitive_dependencies.sh
   tests/IntegrationTests/freeze/my.cabal
   tests/IntegrationTests/freeze/runs_without_error.sh
+  tests/IntegrationTests/internal-libs/cabal.project
   tests/IntegrationTests/internal-libs/internal_lib_basic.sh
   tests/IntegrationTests/internal-libs/internal_lib_shadow.sh
   tests/IntegrationTests/internal-libs/new_build.sh
@@ -85,6 +86,7 @@ Extra-Source-Files:
   tests/IntegrationTests/multiple-source/q/Setup.hs
   tests/IntegrationTests/multiple-source/q/q.cabal
   tests/IntegrationTests/new-build/monitor_cabal_files.sh
+  tests/IntegrationTests/new-build/monitor_cabal_files/cabal.project
   tests/IntegrationTests/new-build/monitor_cabal_files/p/P.hs
   tests/IntegrationTests/new-build/monitor_cabal_files/p/Setup.hs
   tests/IntegrationTests/new-build/monitor_cabal_files/p/p.cabal
@@ -119,6 +121,12 @@ Extra-Source-Files:
   tests/IntegrationTests/user-config/runs_without_error.sh
   tests/IntegrationTests/user-config/uses_CABAL_CONFIG.out
   tests/IntegrationTests/user-config/uses_CABAL_CONFIG.sh
+  tests/IntegrationTests2.hs
+  tests/IntegrationTests2/exception/build/Main.hs
+  tests/IntegrationTests2/exception/build/a.cabal
+  tests/IntegrationTests2/exception/configure/a.cabal
+  tests/IntegrationTests2/exception/no-pkg/empty.in
+  tests/IntegrationTests2/exception/no-pkg2/cabal.project
   -- END gen-extra-source-files
 
 source-repository head

diff --git a/.../IntegrationTests2/exception/no-pkg/empty → ...tegrationTests2/exception/no-pkg/empty.in b/.../IntegrationTests2/exception/no-pkg/empty → ...tegrationTests2/exception/no-pkg/empty.in