Put PackageTests.Tests in the correct spot, and fix up update-cabal-files.sh.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Cabal/Cabal.cabal

@@ -297,7 +297,6 @@ extra-source-files:
   tests/PackageTests/TestSuiteTests/LibV09/Lib.hs
   tests/PackageTests/TestSuiteTests/LibV09/LibV09.cabal
   tests/PackageTests/TestSuiteTests/LibV09/tests/Deadlock.hs
-  tests/PackageTests/Tests.hs
   tests/PackageTests/UniqueIPID/P1/M.hs
   tests/PackageTests/UniqueIPID/P1/my.cabal
   tests/PackageTests/UniqueIPID/P2/M.hs
@@ -590,6 +589,7 @@ test-suite package-tests
     PackageTests.TestStanza.Check
     PackageTests.TestSuiteTests.ExeV10.Check
     PackageTests.PackageTester
+    PackageTests.Tests
   hs-source-dirs: tests
   build-depends:
     base,

update-cabal-files.sh

 #!/bin/sh
-(cd Cabal; misc/gen-extra-source-files.sh Cabal.cabal)
-(cd cabal-install; ../Cabal/misc/gen-extra-source-files.sh cabal-install.cabal)
+(cd Cabal; misc/gen-extra-source-files.hs Cabal.cabal)
+(cd cabal-install; ../Cabal/misc/gen-extra-source-files.hs cabal-install.cabal)