I think you might have missed some cases:<div><br></div><div><div>====> Scanning ../../libraries/directory/tests/all.T</div><div>*** framework failure: found an error while executing ../../libraries/directory/tests/all.T :</div>
<div>Traceback (most recent call last):</div><div> File "../driver/runtests.py", line 251, in <module></div><div> execfile(file)</div><div> File "../../libraries/directory/tests/all.T", line 27, in <module></div>
<div> test('T4113', if_platform('i386-apple-darwin', expect_broken(7604)), compile_and_run, [''])</div><div>NameError: name 'if_platform' is not defined</div><div>====> Scanning ../../libraries/base/tests/all.T</div>
<div>*** framework failure: found an error while executing ../../libraries/base/tests/all.T :</div><div>Traceback (most recent call last):</div><div> File "../driver/runtests.py", line 251, in <module></div>
<div> execfile(file)</div><div> File "../../libraries/base/tests/all.T", line 12, in <module></div><div> if_platform('i386-unknown-openbsd', expect_fail),</div><div>NameError: name 'if_platform' is not defined</div>
<div>====> Scanning ../../libraries/base/tests/IO/all.T</div><div>*** framework failure: found an error while executing ../../libraries/base/tests/IO/all.T :</div><div>Traceback (most recent call last):</div><div> File "../driver/runtests.py", line 251, in <module></div>
<div> execfile(file)</div><div> File "../../libraries/base/tests/IO/all.T", line 107, in <module></div><div> expect_fail_if_windows)), compile_and_run, ['-package unix'])</div><div> File "/Users/tibbe/src/ghc/testsuite/driver/testlib.py", line 651, in test</div>
<div> setup(name, myTestOpts)</div><div> File "/Users/tibbe/src/ghc/testsuite/driver/testlib.py", line 587, in <lambda></div><div> return lambda name, opts, f=f, g=g: _compose(name, opts, f, g)</div>
<div> File "/Users/tibbe/src/ghc/testsuite/driver/testlib.py", line 591, in _compose</div><div> g(name, opts)</div><div> File "/Users/tibbe/src/ghc/testsuite/driver/testlib.py", line 587, in <lambda></div>
<div> return lambda name, opts, f=f, g=g: _compose(name, opts, f, g)</div><div> File "/Users/tibbe/src/ghc/testsuite/driver/testlib.py", line 591, in _compose</div><div> g(name, opts)</div><div> File "/Users/tibbe/src/ghc/testsuite/driver/testlib.py", line 587, in <lambda></div>
<div> return lambda name, opts, f=f, g=g: _compose(name, opts, f, g)</div><div> File "/Users/tibbe/src/ghc/testsuite/driver/testlib.py", line 591, in _compose</div><div> g(name, opts)</div><div>TypeError: expect_fail_if_windows() takes exactly 1 argument (2 given)</div>
<div>====> Scanning ../../libraries/base/tests/Numeric/all.T</div><div>*** framework failure: found an error while executing ../../libraries/base/tests/Numeric/all.T :</div><div>Traceback (most recent call last):</div>
<div> File "../driver/runtests.py", line 251, in <module></div><div> execfile(file)</div><div> File "../../libraries/base/tests/Numeric/all.T", line 10, in <module></div><div> , if_platform('i386-apple-darwin', expect_broken(2370))</div>
<div>NameError: name 'if_platform' is not defined</div><div><br></div><br><div class="gmail_quote">On Fri, Feb 8, 2013 at 6:19 AM, Ian Lynagh <span dir="ltr"><<a href="mailto:igloo@earth.li" target="_blank">igloo@earth.li</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Repository : ssh://<a href="http://darcs.haskell.org//srv/darcs/testsuite" target="_blank">darcs.haskell.org//srv/darcs/testsuite</a><br>
<br>
On branch : master<br>
<br>
<a href="http://hackage.haskell.org/trac/ghc/changeset/22951cdab93ab21dab9fe5597954b922c9c89a48" target="_blank">http://hackage.haskell.org/trac/ghc/changeset/22951cdab93ab21dab9fe5597954b922c9c89a48</a><br>
<br>
>---------------------------------------------------------------<br>
<br>
commit 22951cdab93ab21dab9fe5597954b922c9c89a48<br>
Author: Ian Lynagh <<a href="mailto:ian@well-typed.com">ian@well-typed.com</a>><br>
Date: Fri Feb 8 00:38:42 2013 +0000<br>
<br>
Replace 'if_platform' and 'unless_platform' with 'platform'<br>
<br>
>---------------------------------------------------------------<br>
<br>
driver/testlib.py | 13 ++-----------<br>
tests/codeGen/should_gen_asm/all.T | 6 +++---<br>
tests/ffi/should_run/all.T | 2 +-<br>
tests/ghci/scripts/all.T | 2 +-<br>
tests/numeric/should_run/all.T | 2 +-<br>
tests/perf/compiler/all.T | 6 +++---<br>
tests/rts/all.T | 12 ++++++------<br>
7 files changed, 17 insertions(+), 26 deletions(-)<br>
<br>
diff --git a/driver/testlib.py b/driver/testlib.py<br>
index 4c9b2c2..aa601f7 100644<br>
--- a/driver/testlib.py<br>
+++ b/driver/testlib.py<br>
@@ -312,17 +312,8 @@ def when(b, f):<br>
def unless(b, f):<br>
return when(not b, f)<br>
<br>
-def if_platform( plat, f ):<br>
- if config.platform == plat:<br>
- return f<br>
- else:<br>
- return normal<br>
-<br>
-def unless_platform( plat, f ):<br>
- if config.platform != plat:<br>
- return f<br>
- else:<br>
- return normal<br>
+def platform( plat ):<br>
+ return config.platform == plat<br>
<br>
def if_os( os, f ):<br>
if config.os == os:<br>
diff --git a/tests/codeGen/should_gen_asm/all.T b/tests/codeGen/should_gen_asm/all.T<br>
index a24ae31..be30d5f 100644<br>
--- a/tests/codeGen/should_gen_asm/all.T<br>
+++ b/tests/codeGen/should_gen_asm/all.T<br>
@@ -1,6 +1,6 @@<br>
test('memcpy',<br>
- unless_platform('x86_64-unknown-linux',skip), compile_cmp_asm, [''])<br>
+ unless(platform('x86_64-unknown-linux'),skip), compile_cmp_asm, [''])<br>
test('memcpy-unroll',<br>
- unless_platform('x86_64-unknown-linux',skip), compile_cmp_asm, [''])<br>
+ unless(platform('x86_64-unknown-linux'),skip), compile_cmp_asm, [''])<br>
test('memcpy-unroll-conprop',<br>
- unless_platform('x86_64-unknown-linux',skip), compile_cmp_asm, [''])<br>
+ unless(platform('x86_64-unknown-linux'),skip), compile_cmp_asm, [''])<br>
diff --git a/tests/ffi/should_run/all.T b/tests/ffi/should_run/all.T<br>
index 1811f42..09e6944 100644<br>
--- a/tests/ffi/should_run/all.T<br>
+++ b/tests/ffi/should_run/all.T<br>
@@ -33,7 +33,7 @@ test('ffi004', skip, compile_and_run, [''])<br>
#<br>
test('ffi005', [ omit_ways(prof_ways),<br>
if_arch('i386', skip),<br>
- if_platform('i386-apple-darwin', expect_broken(4105)),<br>
+ when(platform('i386-apple-darwin'), expect_broken(4105)),<br>
exit_code(3) ],<br>
compile_and_run, [''])<br>
<br>
diff --git a/tests/ghci/scripts/all.T b/tests/ghci/scripts/all.T<br>
index f204af7..0b8f62e 100755<br>
--- a/tests/ghci/scripts/all.T<br>
+++ b/tests/ghci/scripts/all.T<br>
@@ -38,7 +38,7 @@ test('ghci022', normal, ghci_script, ['ghci022.script'])<br>
test('ghci023', normal, ghci_script, ['ghci023.script'])<br>
test('ghci024',<br>
[skip_if_fast,<br>
- if_platform("powerpc-apple-darwin", expect_broken(1845))],<br>
+ when(platform("powerpc-apple-darwin"), expect_broken(1845))],<br>
run_command,<br>
['$MAKE -s --no-print-directory ghci024'])<br>
test('ghci025', normal, ghci_script, ['ghci025.script'])<br>
diff --git a/tests/numeric/should_run/all.T b/tests/numeric/should_run/all.T<br>
index b2109de..d2f017a 100644<br>
--- a/tests/numeric/should_run/all.T<br>
+++ b/tests/numeric/should_run/all.T<br>
@@ -7,7 +7,7 @@ test('arith001', normal, compile_and_run, [''])<br>
test('arith002', normal, compile_and_run, [''])<br>
test('arith003', normal, compile_and_run, [''])<br>
test('arith004', normal, compile_and_run, [''])<br>
-test('arith005', if_platform('i386-apple-darwin', expect_broken_for(7043, 'ghci')), compile_and_run, [''])<br>
+test('arith005', when(platform('i386-apple-darwin'), expect_broken_for(7043, 'ghci')), compile_and_run, [''])<br>
test('arith006', normal, compile_and_run, [''])<br>
test('arith007', normal, compile_and_run, [''])<br>
<br>
diff --git a/tests/perf/compiler/all.T b/tests/perf/compiler/all.T<br>
index 09a0297..1ba4c15 100644<br>
--- a/tests/perf/compiler/all.T<br>
+++ b/tests/perf/compiler/all.T<br>
@@ -117,7 +117,7 @@ test('T4801',<br>
# 12/11/2012: 49 (amd64/Linux) (REASON UNKNOWN!)<br>
<br>
# expected value: 58 (amd64/OS X):<br>
- if_platform('x86_64-apple-darwin',<br>
+ when(platform('x86_64-apple-darwin'),<br>
compiler_stats_range_field('peak_megabytes_allocated', 58, 1)),<br>
# expected value: 228286660 (x86/OS X)<br>
when(wordsize(32),<br>
@@ -130,7 +130,7 @@ test('T4801',<br>
# 19/10/2012: 392409984 (amd64/Linux) (-fPIC turned off)<br>
<br>
# expected value: 510938976 (amd64/OS X):<br>
- if_platform('x86_64-apple-darwin',<br>
+ when(platform('x86_64-apple-darwin'),<br>
compiler_stats_range_field('bytes allocated', 510938976, 5)),<br>
<br>
when(wordsize(32),<br>
@@ -144,7 +144,7 @@ test('T4801',<br>
# 19/10/2012: 26882576 (-fPIC turned on)<br>
# 19/10/2012: 18619912 (-fPIC turned off)<br>
# 24/12/2012: 21657520 (perhaps gc sampling time wibbles?)<br>
- if_platform('x86_64-apple-darwin',<br>
+ when(platform('x86_64-apple-darwin'),<br>
compiler_stats_range_field('max_bytes_used', 21657520, 5)),<br>
only_ways(['normal']),<br>
extra_hc_opts('-static')<br>
diff --git a/tests/rts/all.T b/tests/rts/all.T<br>
index 05510e9..380ce85 100644<br>
--- a/tests/rts/all.T<br>
+++ b/tests/rts/all.T<br>
@@ -9,7 +9,7 @@ test('testblockalloc', compose(c_src,<br>
test('bug1010', normal, compile_and_run, ['+RTS -c -RTS'])<br>
test('derefnull',<br>
composes([<br>
- if_platform('x86_64-unknown-mingw32', expect_broken(6079)),<br>
+ when(platform('x86_64-unknown-mingw32'), expect_broken(6079)),<br>
# LLVM Optimiser considers dereference of a null pointer<br>
# undefined and marks the code as unreachable which means<br>
# that later optimisations remove it altogether.<br>
@@ -21,13 +21,13 @@ test('derefnull',<br>
# the right exit code we're OK.<br>
if_os('linux', ignore_output),<br>
# SIGBUS on OX X (PPC and x86 only; amd64 gives SEGV)<br>
- if_platform('i386-apple-darwin', exit_code(138)),<br>
- if_platform('powerpc-apple-darwin', exit_code(138)),<br>
+ when(platform('i386-apple-darwin'), exit_code(138)),<br>
+ when(platform('powerpc-apple-darwin'), exit_code(138)),<br>
if_os('mingw32', exit_code(1))]),<br>
compile_and_run, [''])<br>
test('divbyzero',<br>
composes([<br>
- if_platform('x86_64-unknown-mingw32', expect_broken(6079)),<br>
+ when(platform('x86_64-unknown-mingw32'), expect_broken(6079)),<br>
# SIGFPE on Linux<br>
exit_code(136),<br>
# Apparently the output can be different on different<br>
@@ -121,8 +121,8 @@ def config_T5250(name, opts):<br>
<br>
test('T5250', [ config_T5250,<br>
# stack ptr is not 16-byte aligned on 32-bit Windows<br>
- if_platform('i386-unknown-mingw32', expect_fail),<br>
- if_platform('i386-unknown-linux',<br>
+ when(platform('i386-unknown-mingw32'), expect_fail),<br>
+ when(platform('i386-unknown-linux'),<br>
expect_broken_for(4211,['llvm'])),<br>
extra_clean(['spalign.o']),<br>
omit_ways(['ghci']) ],<br>
<br>
<br>
<br>
_______________________________________________<br>
ghc-commits mailing list<br>
<a href="mailto:ghc-commits@haskell.org">ghc-commits@haskell.org</a><br>
<a href="http://www.haskell.org/mailman/listinfo/ghc-commits" target="_blank">http://www.haskell.org/mailman/listinfo/ghc-commits</a><br>
</blockquote></div><br></div>