diff options
Diffstat (limited to 'testsuite/config/ghc')
| -rw-r--r-- | testsuite/config/ghc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index 6296394197..e974b62a96 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -33,7 +33,7 @@ config.other_ways = ['prof', 'normal_h', 'ghci-ext', 'ghci-ext-prof', 'ext-interp'] -if (ghc_with_native_codegen == 1): +if ghc_with_native_codegen: config.compile_ways.append('optasm') config.run_ways.append('optasm') @@ -44,25 +44,25 @@ if config.have_profiling: if config.have_interp: config.run_ways.append('ghci') -if (ghc_with_threaded_rts == 1): +if ghc_with_threaded_rts: config.run_ways.append('threaded1') - if (ghc_with_smp == 1): + if ghc_with_smp: config.have_smp = True config.run_ways.append('threaded2') -if (ghc_with_dynamic_rts == 1): +if ghc_with_dynamic_rts: config.have_shared_libs = True if config.ghc_dynamic_by_default and config.have_vanilla == 1: config.run_ways.append('static') else: - if (ghc_with_dynamic_rts == 1): + if ghc_with_dynamic_rts: config.run_ways.append('dyn') -if (config.have_profiling and ghc_with_threaded_rts == 1): +if (config.have_profiling and ghc_with_threaded_rts): config.run_ways.append('profthreaded') -if (ghc_with_llvm == 1 and not config.unregisterised): +if (ghc_with_llvm and not config.unregisterised): config.compile_ways.append('optllvm') config.run_ways.append('optllvm') @@ -80,7 +80,7 @@ config.way_flags = { 'prof_no_auto' : ['-prof', '-static', '-fasm'], 'profasm' : ['-O', '-prof', '-static', '-fprof-auto'], 'profthreaded' : ['-O', '-prof', '-static', '-fprof-auto', '-threaded'], - 'ghci' : ['--interactive', '-v0', '-ignore-dot-ghci', '-fno-ghci-history', '+RTS', '-I0.1', '-RTS'], + 'ghci' : ['--interactive', '-v0', '-ignore-dot-ghci', '-fno-ghci-history', '+RTS', '-I0.1', '-RTS'] + (['-fghci-leak-check'] if not config.compiler_debugged else []), 'sanity' : ['-debug'], 'threaded1' : ['-threaded', '-debug'], 'threaded1_ls' : ['-threaded', '-debug'], @@ -158,10 +158,10 @@ llvm_ways = [x[0] for x in config.way_flags.items() if '-fflvm' in x[1]] def get_compiler_info(): - s = getStdout([config.compiler, '--info']).decode('utf8') + s = getStdout([config.compiler, '--info']) s = re.sub('[\r\n]', '', s) compilerInfoDict = dict(eval(s)) - s = getStdout([config.compiler, '+RTS', '--info']).decode('utf8') + s = getStdout([config.compiler, '+RTS', '--info']) s = re.sub('[\r\n]', '', s) rtsInfoDict = dict(eval(s)) |