Fold testsuite.git into ghc.git (re #8545)
authorHerbert Valerio Riedel <hvr@gnu.org>
Sun, 12 Jan 2014 10:40:09 +0000 (11:40 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Sun, 12 Jan 2014 11:47:17 +0000 (12:47 +0100)
This commit performs a subtree merge of testsuite.git into ghc.git;
The next commit will adapt `sync-all` et al. to the new situation.

At the time of merge, testsuite.git was at commit
[998a816ae89c4fd573f4abd7c6abb346cf7ee9af/testsuite]

The following steps have been used to accomplish this merge:

1. Clone a fresh testsuite.git copy (& cd into)

2. Remove accidentally committed binary files from history

 git filter-branch \
  --index-filter "git rm -r --cached --ignore-unmatch \
    tests/haddock/should_compile_flag_nohaddock/a.out \
    tests/haddock/should_compile_noflag_nohaddock/a.out \
    tests/ghc-regress/haddock/should_compile_flag_nohaddock/a.out \
    tests/ghc-regress/haddock/should_compile_noflag_nohaddock/a.out \
    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 \
    tests/ghc-regress/plugins/plugins01" \
   HEAD

3. Rename all paths in testsuite.git to be prefixed with `testsuite/`

 git filter-branch -f --prune-empty --tree-filter \
  "mkdir -p testsuite; \
   git ls-tree --name-only \$GIT_COMMIT | xargs -I files mv files testsuite/"

4. cd into ghc/ checkout, and perform subtree merge of testsuite into ghc
   (see also http://nuclearsquid.com/writings/subtree-merging-and-you/)

 cd ../ghc/
 git remote add -f testsuite ../testsuite/.git
 git merge -s ours --no-commit testsuite/master
 git read-tree --prefix=/ -u testsuite/master
 git commit

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
1  2 
.gitignore

diff --cc .gitignore
index 7fe74cd,0000000..71c297a
mode 100644,000000..100644
--- /dev/null
@@@ -1,175 -1,0 +1,174 @@@
- /testsuite/
 +# -----------------------------------------------------------------------------
 +# generic generated file patterns
 +
 +Thumbs.db
 +.DS_Store
 +
 +*~
 +#*#
 +*.bak
 +*.BAK
 +*.orig
 +*.prof
 +*.rej
 +
 +*.hi
 +*.hi-boot
 +*.o-boot
 +*.p_o
 +*.t_o
 +*.debug_o
 +*.thr_o
 +*.thr_p_o
 +*.thr_debug_o
 +*.o
 +*.a
 +*.o.cmd
 +*.depend*
 +log
 +tags
 +
 +autom4te.cache
 +config.log
 +config.status
 +configure
 +
 +# -----------------------------------------------------------------------------
 +# Ignore any overlapped darcs repos and back up files
 +
 +*-darcs-backup*
 +_darcs/
 +
 +# -----------------------------------------------------------------------------
 +# sub-repositories
 +
 +/ghc-tarballs/
 +/libffi-tarballs/
 +/libraries/array/
 +/libraries/base/
 +/libraries/deepseq/
 +/libraries/directory/
 +/libraries/dph/
 +/libraries/extensible-exceptions/
 +/libraries/filepath/
 +/libraries/ghc-prim/
 +/libraries/haskell2010/
 +/libraries/haskell98/
 +/libraries/hoopl/
 +/libraries/hpc/
 +/libraries/integer-gmp/
 +/libraries/integer-simple/
 +/libraries/mtl/
 +/libraries/old-locale/
 +/libraries/old-time/
 +/libraries/parallel/
 +/libraries/process/
 +/libraries/stm/
 +/libraries/template-haskell/
 +/libraries/unix/
 +/libraries/utf8-string/
 +/nofib/
 +/utils/haddock/
 +/utils/hsc2hs/
 +
 +# -----------------------------------------------------------------------------
 +# Cabal dist directories
 +
 +/driver/ghc/dist/
 +/driver/haddock/dist/
 +/driver/ghci/dist/
 +/driver/split/dist/
 +/includes/dist-*/
 +/libffi/dist-install/
 +/libraries/*/dist-boot/
 +/libraries/*/dist-install/
 +/libraries/dist-haddock/
 +/rts/dist/
 +/utils/*/dist*/
 +/compiler/stage1/
 +/compiler/stage2/
 +/compiler/stage3/
 +/ghc/stage1/
 +/ghc/stage2/
 +/ghc/stage3/
 +
 +# -----------------------------------------------------------------------------
 +# specific generated files
 +
 +/bindist-list
 +/bindistprep/
 +/bindisttest/HelloWorld
 +/bindisttest/
 +/ch01.html
 +/ch02.html
 +/compiler/ghc.cabal
 +/compiler/ghc.cabal.old
 +/distrib/configure.ac
 +/distrib/ghc.iss
 +/docs/index.html
 +/docs/man/flags.xml
 +/docs/man/flags.xsl
 +/docs/man/ghc.1
 +/docs/users_guide/ug-book.xml
 +/docs/users_guide/ug-ent.xml
 +/docs/users_guide/users_guide.xml
 +/docs/users_guide/users_guide.pdf
 +/docs/users_guide/users_guide.ps
 +/docs/users_guide/users_guide/
 +/docs/users_guide/what_glasgow_exts_does.gen.xml
 +/driver/ghci/ghc-pkg-inplace
 +/driver/ghci/ghci-inplace
 +/driver/ghci/ghci.res
 +/driver/package.conf
 +/driver/package.conf.inplace.old
 +/settings
 +/ghc.spec
 +/ghc/ghc-bin.cabal
 +/includes/ghcautoconf.h
 +/includes/ghcplatform.h
 +/index.html
 +/inplace/
 +/libffi/build/
 +/libffi/ffi.h
 +/libffi/package.conf.inplace
 +/libffi/package.conf.inplace.raw
 +/libffi/stamp*
 +/libffi/package.conf.install
 +/libffi/package.conf.install.raw
 +/libraries/bin-package-db/GNUmakefile
 +/libraries/bin-package-db/ghc.mk
 +/libraries/bootstrapping.conf
 +/libraries/prologue.txt
 +/libraries/doc-index*.html
 +/libraries/frames.html
 +/libraries/haddock-util.js
 +/libraries/hslogo-16.png
 +/libraries/index-frames.html
 +/libraries/index.html
 +/libraries/minus.gif
 +/libraries/ocean.css
 +/libraries/plus.gif
 +/libraries/synopsis.png
 +/libraries/stamp/
 +/mk/are-validating.mk
 +/mk/build.mk
 +/mk/config.h
 +/mk/config.h.in
 +/mk/config.mk
 +/mk/config.mk.old
 +/mk/install.mk
 +/mk/project.mk
 +/mk/project.mk.old
 +/mk/validate.mk
 +/rts/package.conf.inplace
 +/rts/package.conf.inplace.raw
 +/rts/package.conf.install
 +/rts/package.conf.install.raw
 +/stage3.package.conf
 +/testsuite_summary.txt
 +/testlog
 +/utils/runghc/runghc.cabal
 +
 +/extra-gcc-opts
 +
 +.tm_properties