Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alfredo Di Napoli
GHC
Commits
55b5bb14
Commit
55b5bb14
authored
Apr 06, 2019
by
Ben Gamari
🐢
Browse files
testsuite: Fix omit_ways usage
omit_ways expects a list but this was broken in several cases.
parent
329dcd7a
Changes
7
Hide whitespace changes
Inline
Side-by-side
testsuite/driver/testlib.py
View file @
55b5bb14
...
...
@@ -274,6 +274,7 @@ def omit_ways( ways ):
return
lambda
name
,
opts
,
w
=
ways
:
_omit_ways
(
name
,
opts
,
w
)
def
_omit_ways
(
name
,
opts
,
ways
):
assert
ways
.
__class__
is
list
opts
.
omit_ways
+=
ways
# -----
...
...
testsuite/tests/concurrent/should_run/all.T
View file @
55b5bb14
...
...
@@ -239,7 +239,7 @@ test('conc067', ignore_stdout, compile_and_run, [''])
# omit threaded2, the behaviour of this test is non-deterministic with more
# than one CPU.
test
('
conc068
',
[
omit_ways
('
threaded2
'),
exit_code
(
1
)
],
compile_and_run
,
[''])
test
('
conc068
',
[
omit_ways
(
[
'
threaded2
'
]
),
exit_code
(
1
)
],
compile_and_run
,
[''])
test
('
setnumcapabilities001
',
[
only_ways
(['
threaded1
','
threaded2
']),
...
...
testsuite/tests/lib/integer/all.T
View file @
55b5bb14
test
('
integerBits
',
normal
,
compile_and_run
,
[''])
test
('
integerConversions
',
normal
,
compile_and_run
,
[''])
# skip ghci as it doesn't support unboxed tuples
test
('
integerGmpInternals
',
[
reqlib
('
integer-gmp
'),
omit_ways
('
ghci
')],
compile_and_run
,
[''])
test
('
plusMinusInteger
',
[
omit_ways
('
ghci
')],
compile_and_run
,
[''])
test
('
integerGmpInternals
',
[
reqlib
('
integer-gmp
'),
omit_ways
(
[
'
ghci
'
]
)],
compile_and_run
,
[''])
test
('
plusMinusInteger
',
[
omit_ways
(
[
'
ghci
'
]
)],
compile_and_run
,
[''])
test
('
integerConstantFolding
',
normal
,
makefile_test
,
['
integerConstantFolding
'])
test
('
fromToInteger
',
[]
,
makefile_test
,
['
fromToInteger
'])
test
('
IntegerConversionRules
',
[]
,
makefile_test
,
['
IntegerConversionRules
'])
...
...
testsuite/tests/programs/barton-mangler-bug/test.T
View file @
55b5bb14
...
...
@@ -8,7 +8,7 @@ test('barton-mangler-bug',
'
Plot.hi
',
'
Plot.o
',
'
PlotExample.hi
',
'
PlotExample.o
',
'
TypesettingTricks.hi
',
'
TypesettingTricks.o
']),
omit_ways
('
debug
')
# Fails for debug way due to annotation linting timeout
omit_ways
(
[
'
debug
'
]
)
# Fails for debug way due to annotation linting timeout
],
multimod_compile_and_run
,
['
Main
',
''])
testsuite/tests/rts/all.T
View file @
55b5bb14
...
...
@@ -93,7 +93,7 @@ test('stack002', [extra_files(['stack001.hs']),
# run this test with very small stack chunks to exercise the stack
# overflow/underflow machinery.
test
('
stack003
',
[
omit_ways
('
ghci
'),
# uses unboxed tuples
test
('
stack003
',
[
omit_ways
(
[
'
ghci
'
]
),
# uses unboxed tuples
extra_run_opts
('
500000 +RTS -kc1k -kb100 -K96m -RTS
')
],
compile_and_run
,
[''])
...
...
testsuite/tests/typecheck/should_run/all.T
View file @
55b5bb14
...
...
@@ -96,7 +96,7 @@ test('T6117', normal, compile_and_run, [''])
test
('
T5751
',
normal
,
compile_and_run
,
[''])
test
('
T5913
',
normal
,
compile_and_run
,
[''])
test
('
T7748
',
normal
,
compile_and_run
,
[''])
test
('
T7861
',
[
omit_ways
('
debug
'),
exit_code
(
1
)],
compile_and_run
,
[''])
test
('
T7861
',
[
omit_ways
(
[
'
debug
'
]
),
exit_code
(
1
)],
compile_and_run
,
[''])
test
('
TcTypeNatSimpleRun
',
normal
,
compile_and_run
,
[''])
test
('
TcTypeSymbolSimpleRun
',
normal
,
compile_and_run
,
[''])
test
('
T8119
',
normal
,
ghci_script
,
['
T8119.script
'])
...
...
testsuite/tests/utils/should_run/all.T
View file @
55b5bb14
test
('
T14854
',
[
only_ways
(
threaded_ways
),
omit_ways
('
ghci
'),
omit_ways
(
[
'
ghci
'
]
),
reqlib
('
random
'),
ignore_stderr
],
compile_and_run
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment