diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-05-28 22:00:00 +0200 |
---|---|---|
committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-04 23:58:29 +0200 |
commit | e340f6eccc9d6d8f0a11c56c312570060c245946 (patch) | |
tree | a94a473f864e6483fa8d19ef7202295a5628e047 /testsuite/tests/generics/all.T | |
parent | d0063e8975672714a6ae33f7e8175421c6b5d5c5 (diff) | |
download | haskell-e340f6eccc9d6d8f0a11c56c312570060c245946.tar.gz |
Testsuite: add/fix cleanup for certain tests
* extra_clean argument should be a list
Add an assert to prevent regressions.
* properly clean package conf direcories
They are directories now, which was causing problems.
* properly clean write_interface_* tests
We were getting these errors:
[Errno 21] Is a directory: './driver/write_interface_oneshot'
[Errno 39] Directory not empty: './driver/write_interface_oneshot'
[Errno 21] Is a directory: './driver/write_interface_make'
[Errno 39] Directory not empty: './driver/write_interface_make'
* outputdir() is better than -outputdir, as it knows how to (pre)clean
itself.
Diffstat (limited to 'testsuite/tests/generics/all.T')
-rw-r--r-- | testsuite/tests/generics/all.T | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/tests/generics/all.T b/testsuite/tests/generics/all.T index 98116ec519..9a2103f3b4 100644 --- a/testsuite/tests/generics/all.T +++ b/testsuite/tests/generics/all.T @@ -19,12 +19,12 @@ test('GenCannotDoRep1_6', normal, compile_fail, ['']) test('GenCannotDoRep1_7', normal, compile_fail, ['']) test('GenCannotDoRep1_8', normal, compile_fail, ['']) -test('T5462Yes1', extra_clean(['T5462Yes1/GFunctor.hi']) - , multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor -outputdir=out_T5462Yes1']) -test('T5462Yes2', extra_clean(['T5462Yes2/GFunctor.hi']) - , multimod_compile_and_run, ['T5462Yes2', '-iGFunctor -outputdir=out_T5462Yes2']) -test('T5462No1', extra_clean(['T5462No1/GFunctor.hi']) - , multimod_compile_fail, ['T5462No1', '-iGFunctor -outputdir=T5462No1']) +test('T5462Yes1', outputdir('out_T5462Yes1') + , multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor']) +test('T5462Yes2', outputdir('out_T5462Yes2') + , multimod_compile_and_run, ['T5462Yes2', '-iGFunctor']) +test('T5462No1', outputdir('out_T5462No1') + , multimod_compile_fail, ['T5462No1', '-iGFunctor']) test('T5884', extra_clean(['T5884Other.o', 'T5884Other.hi']) , multimod_compile, ['T5884Other', '-v0']) |