Update some more files for ghc-regress removal

testsuite/.gitignore

@@ -32,84 +32,84 @@ Thumbs.db
 # -----------------------------------------------------------------------------
 # specific generated files
 
-tests/ghc-regress/cabal/local01.package.conf/
-tests/ghc-regress/cabal/local03.package.conf/
-tests/ghc-regress/cabal/local04.package.conf/
-tests/ghc-regress/cabal/local05a.package.conf/
-tests/ghc-regress/cabal/local05b.package.conf/
-tests/ghc-regress/cabal/local06.package.conf/
-tests/ghc-regress/cabal/local1750.package.conf/
-tests/ghc-regress/cabal/localshadow1.package.conf/
-tests/ghc-regress/cabal/localshadow2.package.conf/
-tests/ghc-regress/cabal/package.conf.ghcpkg02/
-tests/ghc-regress/cabal/shadow1.out
-tests/ghc-regress/cabal/shadow2.out
-tests/ghc-regress/cabal/shadow3.out
-tests/ghc-regress/driver/3674_pre
-tests/ghc-regress/driver/A012.ooo
-tests/ghc-regress/driver/A013.xhi
-tests/ghc-regress/driver/B022/C.ooo
-tests/ghc-regress/driver/B023/C.xhi
-tests/ghc-regress/driver/B024a/
-tests/ghc-regress/driver/F018a.obj.018
-tests/ghc-regress/driver/F018a_stub.obj.018
-tests/ghc-regress/driver/Test.081b
-tests/ghc-regress/driver/Test.081b.hs
-tests/ghc-regress/driver/Test_081a
-tests/ghc-regress/driver/Test_081a.hs
-tests/ghc-regress/driver/hello062a
-tests/ghc-regress/driver/hello062b
-tests/ghc-regress/driver/hello062c
-tests/ghc-regress/driver/hello062d
-tests/ghc-regress/driver/hello062e
-tests/ghc-regress/driver/out019/
-tests/ghc-regress/driver/rtsOpts
-tests/ghc-regress/driver/stub017/
-tests/ghc-regress/driver/stub028/
-tests/ghc-regress/driver/stub035/
-tests/ghc-regress/driver/stub045/
-tests/ghc-regress/driver/T706.hs
-tests/ghc-regress/ffi/should_run/.hpc/
-tests/ghc-regress/ghci/prog001/D.hs
-tests/ghc-regress/ghci/should_run/3171.err
-tests/ghc-regress/lib/IO/encoding001.utf16.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf16be.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf16le.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf32.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf32be.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf32le.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf8.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf8_bom
-tests/ghc-regress/lib/IO/encoding001.utf8_bom.utf16
-tests/ghc-regress/lib/IO/encoding001.utf8_bom.utf16be
-tests/ghc-regress/lib/IO/encoding001.utf8_bom.utf16le
-tests/ghc-regress/lib/IO/encoding001.utf8_bom.utf32
-tests/ghc-regress/lib/IO/encoding001.utf8_bom.utf32be
-tests/ghc-regress/lib/IO/encoding001.utf8_bom.utf32le
-tests/ghc-regress/lib/IO/encoding001.utf8_bom.utf8
-tests/ghc-regress/lib/should_run/array001.data
-tests/ghc-regress/perf/compiler/T1969.comp.stats
-tests/ghc-regress/perf/compiler/T3064.comp.stats
-tests/ghc-regress/perf/compiler/T3294.comp.stats
-tests/ghc-regress/perf/compiler/T4801.comp.stats
-tests/ghc-regress/perf/should_run/speed.f32
-tests/ghc-regress/rename/prog006/local.package.conf
-tests/ghc-regress/rts/4059
-tests/ghc-regress/rts/4059_stub.c
-tests/ghc-regress/rts/4059_stub.h
-tests/ghc-regress/rts/prep.out
-tests/ghc-regress/th/TH_import_loop/ModuleA.hi-boot
-tests/ghc-regress/th/TH_import_loop/ModuleA.o-boot
-tests/ghc-regress/typecheck/should_fail/T3468.o-boot
+tests/cabal/local01.package.conf/
+tests/cabal/local03.package.conf/
+tests/cabal/local04.package.conf/
+tests/cabal/local05a.package.conf/
+tests/cabal/local05b.package.conf/
+tests/cabal/local06.package.conf/
+tests/cabal/local1750.package.conf/
+tests/cabal/localshadow1.package.conf/
+tests/cabal/localshadow2.package.conf/
+tests/cabal/package.conf.ghcpkg02/
+tests/cabal/shadow1.out
+tests/cabal/shadow2.out
+tests/cabal/shadow3.out
+tests/driver/3674_pre
+tests/driver/A012.ooo
+tests/driver/A013.xhi
+tests/driver/B022/C.ooo
+tests/driver/B023/C.xhi
+tests/driver/B024a/
+tests/driver/F018a.obj.018
+tests/driver/F018a_stub.obj.018
+tests/driver/Test.081b
+tests/driver/Test.081b.hs
+tests/driver/Test_081a
+tests/driver/Test_081a.hs
+tests/driver/hello062a
+tests/driver/hello062b
+tests/driver/hello062c
+tests/driver/hello062d
+tests/driver/hello062e
+tests/driver/out019/
+tests/driver/rtsOpts
+tests/driver/stub017/
+tests/driver/stub028/
+tests/driver/stub035/
+tests/driver/stub045/
+tests/driver/T706.hs
+tests/ffi/should_run/.hpc/
+tests/ghci/prog001/D.hs
+tests/ghci/should_run/3171.err
+tests/lib/IO/encoding001.utf16.utf8_bom
+tests/lib/IO/encoding001.utf16be.utf8_bom
+tests/lib/IO/encoding001.utf16le.utf8_bom
+tests/lib/IO/encoding001.utf32.utf8_bom
+tests/lib/IO/encoding001.utf32be.utf8_bom
+tests/lib/IO/encoding001.utf32le.utf8_bom
+tests/lib/IO/encoding001.utf8.utf8_bom
+tests/lib/IO/encoding001.utf8_bom
+tests/lib/IO/encoding001.utf8_bom.utf16
+tests/lib/IO/encoding001.utf8_bom.utf16be
+tests/lib/IO/encoding001.utf8_bom.utf16le
+tests/lib/IO/encoding001.utf8_bom.utf32
+tests/lib/IO/encoding001.utf8_bom.utf32be
+tests/lib/IO/encoding001.utf8_bom.utf32le
+tests/lib/IO/encoding001.utf8_bom.utf8
+tests/lib/should_run/array001.data
+tests/perf/compiler/T1969.comp.stats
+tests/perf/compiler/T3064.comp.stats
+tests/perf/compiler/T3294.comp.stats
+tests/perf/compiler/T4801.comp.stats
+tests/perf/should_run/speed.f32
+tests/rename/prog006/local.package.conf
+tests/rts/4059
+tests/rts/4059_stub.c
+tests/rts/4059_stub.h
+tests/rts/prep.out
+tests/th/TH_import_loop/ModuleA.hi-boot
+tests/th/TH_import_loop/ModuleA.o-boot
+tests/typecheck/should_fail/T3468.o-boot
 timeout/calibrate.out
 timeout/install-inplace/
 timeout/dist/
 
-/tests/ghc-regress/dph/dotp/dph-dotp-fast
-/tests/ghc-regress/dph/diophantine/dph-diophantine-fast
-/tests/ghc-regress/dph/diophantine/dph-diophantine-opt
-/tests/ghc-regress/dph/primespj/dph-primespj-fast
-/tests/ghc-regress/dph/quickhull/dph-quickhull-fast
-/tests/ghc-regress/dph/smvm/dph-smvm
-/tests/ghc-regress/dph/sumnats/dph-sumnats
-/tests/ghc-regress/dph/words/dph-words-fast
\ No newline at end of file
+/tests/dph/dotp/dph-dotp-fast
+/tests/dph/diophantine/dph-diophantine-fast
+/tests/dph/diophantine/dph-diophantine-opt
+/tests/dph/primespj/dph-primespj-fast
+/tests/dph/quickhull/dph-quickhull-fast
+/tests/dph/smvm/dph-smvm
+/tests/dph/sumnats/dph-sumnats
+/tests/dph/words/dph-words-fast

testsuite/Makefile

@@ -15,7 +15,7 @@ boot:
 	$(MAKE) -C $(TOP)/timeout all
 
 all:
-	$(MAKE) -C $(TOP)/tests/ghc-regress all
+	$(MAKE) -C $(TOP)/tests all
 
 endif
 endif

testsuite/mk/test.mk

@@ -17,7 +17,7 @@
 #
 # -----------------------------------------------------------------------------
 
-# export the value of $MAKE for invocation in ghc-regress/driver/
+# export the value of $MAKE for invocation in tests/driver/
 export MAKE
 
 RUNTESTS     = $(TOP)/driver/runtests.py