Fold testsuite.git into ghc.git (re #8545)

Authored by hvr on Jan 12 2014, 4:40 AM.

Description

Fold testsuite.git into ghc.git (re Trac #8545)

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)
  1. 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
  1. 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/"
  1. 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>

Details

Committed
hvrJan 12 2014, 5:47 AM
Pushed
bgamariAug 25 2016, 1:39 PM
Parents
rGHCDIFFad233cf68ea4: Add forgotten stderr output for T5498
rGHCDIFFa924debcbb3d: fix a mistyped label that caused a stray reference
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
ad233cf68ea4nomeata
Add forgotten stderr output for T5498 
Jan 10 2014
d154b7be262fsimonpj
Test Trac #8651 
Jan 10 2014
21b324539aaasimonpj
Test Trac #8649 
Jan 10 2014
e8529d31ac2bsimonpj
Adjust "max_bytes_used" upward for T4801 
Jan 10 2014
eeb696328460simonpj
Changes in error messages when fixing Trac #8649 
Jan 9 2014
91252ef0f0d3simonpj
Test Trac #5498 
Jan 9 2014
b014797dc7c0nomeata
Test that runST is not inlined prematurely 
Jan 8 2014
c53b339591ecJohn Lenz/austin
Tests for #8601 
Jan 7 2014
036916bd125fChris Heller/austin
Add test suite for #8602 
Jan 7 2014
fc194269ef43nomeata
Update perf values for T5237 
Jan 6 2014
c3a08c09b7a6nomeata
Add output for T8639 
Jan 6 2014
167542327dcfnomeata
Update T7594 properly 
Jan 6 2014
a9eed4812d25simonpj
Test Trac #8579 
Jan 3 2014
de705b801a10simonpj
Test Trac #8628 
Jan 3 2014
7f2bf06ebfb5simonpj
Test Trac #8640 
Jan 3 2014
bcd92b038d9dsimonpj
Do hFlush in the T8639_api test 
Jan 3 2014
b0cdb9b3b6c6simonpj
Update T7594 as a result of fixing #8644 
Jan 3 2014
c06528c3c988simonpj
White space only 
Jan 3 2014
e54ce01a11c9simonpj
Test Trac #8644 
Jan 3 2014
fb121d3fc6e6simonpj
Improved out-of-scope error for qualified names in GHCi 
Jan 2 2014
40db99a7c485simonpj
Test Trac #8639 
Jan 2 2014
f54fc09bb172simonpj
Test Trac #8639 (just the GHCi version) 
Jan 2 2014
22770b4d2300simonpj
Test Trac #8625 
Jan 2 2014
4393b4ba0f2enomeata
Fix number literal syntax mistake 
Dec 30 2013
d53a09581bcfsimonpj
Error message wibbles 
Dec 28 2013
33b931cc8c0dsimonpj
Test Trac #8603 
Dec 28 2013
a5cb317f1fcesimonpj
Test Trac #8633 
Dec 28 2013
03d7cc6f4448simonpj
Update perf numbers for 32-bit This has not been done for ages 
Dec 28 2013
00cd65fa4ad2goldfire
Error wibbles while fixing #8607. 
Dec 26 2013
f116efaa1023nomeata
Update compiler performance values 
Dec 12 2013
fedd570e6003nomeata
lazy-bs-alloc improved from oneshotness stuff 
Dec 12 2013
d39bb030f93cnomeata
Adjust output to new oneshotness 
Dec 12 2013
0da1a84dde57simonpj
Test Trac #8566 
Dec 10 2013
bef57f09565dnomeata
Sort the output of -dump-strsigs 
Dec 9 2013
08d21c45eddbnomeata
Demand Analyser testcase: Unsaturated functions 
Dec 9 2013
9e84e1325d1anomeata
Add nested CPR testcase 
Dec 9 2013
5a0eabadc77anomeata
Mark testcase for #8598 as not broken 
Dec 9 2013
fb906bfec7adnomeata
Use -ddump-strsigs in tests/stranal/sigs 
Dec 9 2013
773003a48d6cnomeata
Add testcase for #8598 
Dec 9 2013
373e34043951nomeata
More different quotes in error messages following lexer clean-up 
Dec 5 2013
6b52a20997a5simonpj
Test Trac #8577 
Dec 5 2013
75dbe8725d69simonpj
Different quotes in error messages following lexer clean-up 
Dec 5 2013
f783a6fc54cfaustin
Add new ghc-e/should_fail test suite 
Dec 4 2013
381724bfd894nomeata
Update output: More elaborate GND error messages 
Dec 4 2013
f6f82a9181abnomeata
Update output: New error messages as per #8576 
Dec 3 2013
aba39d0056abgoldfire
Wibbles to output caused by change in checking role annotations 
Dec 2 2013
102fe6ac5cefnomeata
Test case about HyperStr and UseDemand 
Dec 2 2013
ca80875a24f0nomeata
Looks like plugin06 really only works with dynamic libraries enabled 
Dec 2 2013
acdb3a46555bnomeata
TH_import_loops fails for GHCi again 
Dec 2 2013
c838eb11a42bnomeata
Try to set flags for some tests involving TH right 
Dec 2 2013

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.