[commit: ghc] wip/python3: Fix mixed tab/space indentation in tests (8118bd1)
git at git.haskell.org
git at git.haskell.org
Sat Sep 20 23:20:56 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/python3
Link : http://ghc.haskell.org/trac/ghc/changeset/8118bd1d5709e99559c7bd65442eb192488660f6/ghc
>---------------------------------------------------------------
commit 8118bd1d5709e99559c7bd65442eb192488660f6
Author: Krzysztof Gogolewski <krz.gogolewski at gmail.com>
Date: Sat Sep 20 18:29:32 2014 +0200
Fix mixed tab/space indentation in tests
Python 3 does not like it
>---------------------------------------------------------------
8118bd1d5709e99559c7bd65442eb192488660f6
testsuite/tests/ffi/should_run/all.T | 10 +++++-----
testsuite/tests/ghci/prog004/prog004.T | 4 ++--
testsuite/tests/numeric/should_run/all.T | 8 ++++----
testsuite/tests/plugins/all.T | 4 ++--
testsuite/tests/th/TH_spliceViewPat/test.T | 6 +++---
testsuite/tests/th/all.T | 6 +++---
testsuite/tests/typecheck/should_run/all.T | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index 7efc6eb..6fe0878 100644
--- a/testsuite/tests/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
@@ -50,10 +50,10 @@ test('ffi008', [exit_code(1), omit_ways(['ghci'])], compile_and_run, [''])
maybe_skip = normal
opts = ''
if config.platform.startswith('i386-'):
- if config.compiler_type == 'ghc' and \
+ if config.compiler_type == 'ghc' and \
version_ge(config.compiler_version, '6.13'):
- opts = '-msse2'
- else:
+ opts = '-msse2'
+ else:
maybe_skip = only_ways(['ghci'])
test('ffi009', [when(fast(), skip),
@@ -69,9 +69,9 @@ test('ffi011', normal, compile_and_run, [''])
# it.
if config.os == 'mingw32':
- skip_if_not_windows = normal
+ skip_if_not_windows = normal
else:
- skip_if_not_windows = skip
+ skip_if_not_windows = skip
test('ffi012', skip_if_not_windows, compile_and_run, [''])
test('ffi013', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghci/prog004/prog004.T b/testsuite/tests/ghci/prog004/prog004.T
index ed17afd..4b6ee13 100644
--- a/testsuite/tests/ghci/prog004/prog004.T
+++ b/testsuite/tests/ghci/prog004/prog004.T
@@ -1,8 +1,8 @@
setTestOpts(only_compiler_types(['ghc']))
def f(name, opts):
- if not ('ghci' in config.run_ways):
- opts.skip = 1
+ if not ('ghci' in config.run_ways):
+ opts.skip = 1
setTestOpts(f)
test('ghciprog004',
diff --git a/testsuite/tests/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T
index 72c8e6a..76181a2 100644
--- a/testsuite/tests/numeric/should_run/all.T
+++ b/testsuite/tests/numeric/should_run/all.T
@@ -15,11 +15,11 @@ test('arith007', normal, compile_and_run, [''])
ways = normal
opts = ''
if config.platform.startswith('i386-'):
- if config.compiler_type == 'ghc' and \
+ if config.compiler_type == 'ghc' and \
version_ge(config.compiler_version, '6.13'):
- opts = '-msse2'
- else:
- ways = expect_fail_for(['optasm','threaded2','hpc','dyn','profasm'])
+ opts = '-msse2'
+ else:
+ ways = expect_fail_for(['optasm','threaded2','hpc','dyn','profasm'])
test('arith008', ways, compile_and_run, [opts])
diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index 7e5f9b4..8b2256a 100644
--- a/testsuite/tests/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
@@ -1,6 +1,6 @@
def f(name, opts):
- if (ghc_with_interpreter == 0):
- opts.skip = 1
+ if (ghc_with_interpreter == 0):
+ opts.skip = 1
setTestOpts(f)
setTestOpts(when(compiler_lt('ghc', '7.1'), skip))
diff --git a/testsuite/tests/th/TH_spliceViewPat/test.T b/testsuite/tests/th/TH_spliceViewPat/test.T
index c08e7cb..21fdff3 100644
--- a/testsuite/tests/th/TH_spliceViewPat/test.T
+++ b/testsuite/tests/th/TH_spliceViewPat/test.T
@@ -1,7 +1,7 @@
def f(name, opts):
- opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
- if (ghc_with_interpreter == 0):
- opts.skip = 1
+ opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
+ if (ghc_with_interpreter == 0):
+ opts.skip = 1
setTestOpts(f)
setTestOpts(only_compiler_types(['ghc']))
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 6e86d30..00f5fc9 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -4,9 +4,9 @@
test('T4255', unless(compiler_profiled(), skip), compile_fail, ['-v0'])
def f(name, opts):
- opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
- if (ghc_with_interpreter == 0):
- opts.skip = 1
+ opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
+ if (ghc_with_interpreter == 0):
+ opts.skip = 1
setTestOpts(f)
setTestOpts(only_compiler_types(['ghc']))
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index 760d5e1..5da7c8b 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -19,8 +19,8 @@ test('TcCoercible', when(compiler_lt('ghc', '7.7'), skip), compile_and_run, ['']
# Skip everything else if fast is on
def f(name, opts):
- if config.fast:
- opts.skip = 1
+ if config.fast:
+ opts.skip = 1
setTestOpts(f)
test('tcrun006', normal, compile_and_run, [''])
More information about the ghc-commits
mailing list