From 41adf38c904dab7ec8f6cd7b92720ead36be459b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 4 Sep 2011 21:07:45 +0100 Subject: [PATCH] Fix some more written-but-not-cleaned files --- testsuite/tests/ffi/should_run/all.T | 4 +++- testsuite/tests/lib/IO/all.T | 35 +++++++--------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T index d6fdc8cde4..6a72e3ae86 100644 --- a/testsuite/tests/ffi/should_run/all.T +++ b/testsuite/tests/ffi/should_run/all.T @@ -92,7 +92,9 @@ test('ffi012', skip_if_not_windows, compile_and_run, ['']) test('ffi013', expect_fail_for(['extcore','optextcore']), compile_and_run, ['']) # threaded2 sometimes gives ffi014: Main_dDu: interrupted -test('ffi014', only_ways(['threaded1','threaded2']), compile_and_run, ['ffi014_cbits.c']) +test('ffi014', + [only_ways(['threaded1','threaded2']), extra_clean(['ffi014_cbits.o'])], + compile_and_run, ['ffi014_cbits.c']) # GHCi can't handle the separate C file (ToDo: fix this somehow) test('ffi015', [ omit_ways(['ghci']), extra_clean(['ffi015_cbits.o']) ], diff --git a/testsuite/tests/lib/IO/all.T b/testsuite/tests/lib/IO/all.T index 2b5cfe6d9c..902168dc59 100644 --- a/testsuite/tests/lib/IO/all.T +++ b/testsuite/tests/lib/IO/all.T @@ -127,33 +127,16 @@ test('4855', normal, compile_and_run, ['']) test('hSetEncoding001',extra_run_opts('hSetEncoding001.in'), compile_and_run, ['']) test('decodingerror001',normal, compile_and_run, ['']) +encoding001Encodings = ["utf8", "utf8_bom", "utf16", "utf16le", + "utf16be", "utf32", "utf32le", "utf32be"] +encoding001CleanFiles = [] +for e in encoding001Encodings: + encoding001CleanFiles.append('encoding001.' + e) +for e1 in encoding001Encodings: + for e2 in encoding001Encodings: + encoding001CleanFiles.append('encoding001.' + e1 + '.' + e2) test('encoding001', - extra_clean([ - 'encoding001.utf16', 'encoding001.utf16.utf16be', - 'encoding001.utf16.utf16le', 'encoding001.utf16.utf32', - 'encoding001.utf16.utf32be', 'encoding001.utf16.utf32le', - 'encoding001.utf16.utf8', 'encoding001.utf16be', - 'encoding001.utf16be.utf16', 'encoding001.utf16be.utf16le', - 'encoding001.utf16be.utf32', 'encoding001.utf16be.utf32be', - 'encoding001.utf16be.utf32le', 'encoding001.utf16be.utf8', - 'encoding001.utf16le', 'encoding001.utf16le.utf16', - 'encoding001.utf16le.utf16be', 'encoding001.utf16le.utf32', - 'encoding001.utf16le.utf32be', 'encoding001.utf16le.utf32le', - 'encoding001.utf16le.utf8', 'encoding001.utf32', - 'encoding001.utf32.utf16', 'encoding001.utf32.utf16be', - 'encoding001.utf32.utf16le', 'encoding001.utf32.utf32be', - 'encoding001.utf32.utf32le', 'encoding001.utf32.utf8', - 'encoding001.utf32be', 'encoding001.utf32be.utf16', - 'encoding001.utf32be.utf16be', 'encoding001.utf32be.utf16le', - 'encoding001.utf32be.utf32', 'encoding001.utf32be.utf32le', - 'encoding001.utf32be.utf8', 'encoding001.utf32le', - 'encoding001.utf32le.utf16', 'encoding001.utf32le.utf16be', - 'encoding001.utf32le.utf16le', 'encoding001.utf32le.utf32', - 'encoding001.utf32le.utf32be', 'encoding001.utf32le.utf8', - 'encoding001.utf8', 'encoding001.utf8.utf16', - 'encoding001.utf8.utf16be', 'encoding001.utf8.utf16le', - 'encoding001.utf8.utf32', 'encoding001.utf8.utf32be', - 'encoding001.utf8.utf32le']), + extra_clean(encoding001CleanFiles), compile_and_run, ['']) test('encoding002', normal, compile_and_run, ['']) -- GitLab