diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-07-13 11:30:37 +0200 |
---|---|---|
committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-07-14 00:31:27 +0200 |
commit | 5764ade40104db4efacf5a5e452335f0aac1be8d (patch) | |
tree | c8daa93ee9102172cd27efbecb4a7cf999acddcb /testsuite | |
parent | 392ff06d4bc47bcd731404a48355d8b165609293 (diff) | |
download | haskell-5764ade40104db4efacf5a5e452335f0aac1be8d.tar.gz |
Testsuite: delete unused with_namebase
It was introduced in 39c6c735c216d259854ee31b15ec87ea653f2b5d (2007).
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/driver/testglobals.py | 4 | ||||
-rw-r--r-- | testsuite/driver/testlib.py | 43 |
2 files changed, 5 insertions, 42 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index 76d26a386e..34767f496b 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -166,10 +166,6 @@ def getTestRun(): class TestOptions: def __init__(self): - # if not None then we look for namebase.stderr etc rather than - # using the test name - self.with_namebase = None - # skip this test? self.skip = 0 diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 0fcb738756..cb38949eba 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -410,14 +410,6 @@ def tag( t ): # --- -def namebase( nb ): - return lambda opts, nb=nb: _namebase(opts, nb) - -def _namebase( opts, nb ): - opts.with_namebase = nb - -# --- - def high_memory_usage(name, opts): opts.alone = True @@ -1049,12 +1041,7 @@ def do_compile( name, way, should_fail, top_mod, extra_mods, extra_hc_opts, over # of whether we expected the compilation to fail or not (successful # compilations may generate warnings). - if getTestOpts().with_namebase == None: - namebase = name - else: - namebase = getTestOpts().with_namebase - - (platform_specific, expected_stderr_file) = platform_wordsize_qualify(namebase, 'stderr') + (platform_specific, expected_stderr_file) = platform_wordsize_qualify(name, 'stderr') actual_stderr_file = qualify(name, 'comp.stderr') if not compare_outputs(way, 'stderr', @@ -1079,12 +1066,7 @@ def compile_cmp_asm( name, way, extra_hc_opts ): # of whether we expected the compilation to fail or not (successful # compilations may generate warnings). - if getTestOpts().with_namebase == None: - namebase = name - else: - namebase = getTestOpts().with_namebase - - (platform_specific, expected_asm_file) = platform_wordsize_qualify(namebase, 'asm') + (platform_specific, expected_asm_file) = platform_wordsize_qualify(name, 'asm') actual_asm_file = qualify(name, 's') if not compare_outputs(way, 'asm', @@ -1530,13 +1512,8 @@ def get_compiler_flags(override_flags, noforce): return flags def check_stdout_ok(name, way): - if getTestOpts().with_namebase == None: - namebase = name - else: - namebase = getTestOpts().with_namebase - actual_stdout_file = qualify(name, 'run.stdout') - (platform_specific, expected_stdout_file) = platform_wordsize_qualify(namebase, 'stdout') + (platform_specific, expected_stdout_file) = platform_wordsize_qualify(name, 'stdout') def norm(str): if platform_specific: @@ -1558,13 +1535,8 @@ def dump_stdout( name ): print(read_no_crs(qualify(name, 'run.stdout'))) def check_stderr_ok(name, way): - if getTestOpts().with_namebase == None: - namebase = name - else: - namebase = getTestOpts().with_namebase - actual_stderr_file = qualify(name, 'run.stderr') - (platform_specific, expected_stderr_file) = platform_wordsize_qualify(namebase, 'stderr') + (platform_specific, expected_stderr_file) = platform_wordsize_qualify(name, 'stderr') def norm(str): if platform_specific: @@ -1634,13 +1606,8 @@ def check_prof_ok(name, way): print(prof_file + " is empty") return(False) - if getTestOpts().with_namebase == None: - namebase = name - else: - namebase = getTestOpts().with_namebase - (platform_specific, expected_prof_file) = \ - platform_wordsize_qualify(namebase, 'prof.sample') + platform_wordsize_qualify(name, 'prof.sample') # sample prof file is not required if not os.path.exists(expected_prof_file): |