Commit e4753d28 authored by sampsong's avatar sampsong Committed by Commit Bot

[test] Fix test status file simulator_run not evaluate to boolean error

and clean up equal operator

BUG=
R=bjaideep@ca.ibm.com, jyan@ca.ibm.com, joransiu@ca.ibm.com, machenbach@chromium.org, rossberg@chromium.org

Review-Url: https://codereview.chromium.org/2961873002
Cr-Commit-Position: refs/heads/master@{#46301}
parent 040fa06f
......@@ -134,14 +134,14 @@
' test-api/LoadICFastApi_DirectCall_GCMoveStubWithProfiler': [SKIP],
}], # 'arch == arm64'
['arch == arm64 and simulator_run == True', {
['arch == arm64 and simulator_run', {
# Pass but take too long with the simulator.
'test-api/ExternalArrays': [PASS, SLOW],
'test-api/Threading*': [SKIP],
}], # 'arch == arm64 and simulator_run == True'
}], # 'arch == arm64 and simulator_run'
['arch == arm64 and mode == debug and simulator_run == True', {
['arch == arm64 and mode == debug and simulator_run', {
# Pass but take too long with the simulator in debug mode.
'test-api/ExternalDoubleArray': [SKIP],
......@@ -150,7 +150,7 @@
'test-api/ExternalFloatArray': [SKIP],
'test-api/Float32Array': [SKIP],
'test-api/Float64Array': [SKIP],
}], # 'arch == arm64 and mode == debug and simulator_run == True'
}], # 'arch == arm64 and mode == debug and simulator_run'
##############################################################################
['asan == True', {
......@@ -228,10 +228,10 @@
}], # 'system == windows and arch == x64 and mode == debug'
##############################################################################
['arch == arm and simulator_run == True', {
['arch == arm and simulator_run', {
# Pass but take too long with the simulator.
'test-api/Threading*': [SKIP],
}], # 'arch == arm and simulator_run == True'
}], # 'arch == arm and simulator_run'
##############################################################################
['arch == arm', {
......@@ -345,13 +345,13 @@
}], # 'system == aix or (arch == ppc64 and byteorder == big)'
##############################################################################
['arch == ppc and simulator_run == True or arch == ppc64 and simulator_run == True', {
['arch == ppc and simulator_run or arch == ppc64 and simulator_run', {
# Pass but take too long with the simulator.
'test-api/Threading*': [PASS, SLOW],
'test-api/ExternalArrays': [PASS, SLOW],
}], # 'arch == ppc64 and simulator_run == True'
}], # 'arch == ppc64 and simulator_run'
##############################################################################
['variant == wasm_traps', {
......
......@@ -325,7 +325,7 @@
'whitespaces': [PASS, SLOW],
}], # 'arch == arm64'
['arch == arm64 and mode == debug and simulator_run == True', {
['arch == arm64 and mode == debug and simulator_run', {
# Pass but take too long with the simulator in debug mode.
'array-sort': [PASS, SLOW],
......@@ -337,7 +337,7 @@
'unicodelctest-no-optimization': [PASS, SLOW],
# Issue 3219:
'getters-on-elements': [PASS, ['gc_stress == True', FAIL]],
}], # 'arch == arm64 and mode == debug and simulator_run == True'
}], # 'arch == arm64 and mode == debug and simulator_run'
##############################################################################
['asan == True', {
......@@ -589,11 +589,11 @@
}], # 'predictable == True'
##############################################################################
['arch == ppc and simulator_run == True or arch == ppc64 and simulator_run == True', {
['arch == ppc and simulator_run or arch == ppc64 and simulator_run', {
# take too long with the simulator.
'regress/regress-1132': [SKIP],
}], # 'arch == ppc and simulator_run == True'
}], # 'arch == ppc and simulator_run'
##############################################################################
['arch == ppc64', {
......
......@@ -923,14 +923,14 @@
'js1_5/GC/regress-203278-2': [PASS, SLOW, NO_VARIANTS],
}], # 'arch == mipsel or arch == mips64el or arch == mips64'
['arch == mipsel and simulator_run == True', {
['arch == mipsel and simulator_run', {
# Crashes due to C stack overflow.
'js1_5/extensions/regress-355497': [SKIP],
}], # 'arch == mipsel and simulator_run == True'
}], # 'arch == mipsel and simulator_run'
['arch == mips64el and simulator_run == True', {
['arch == mips64el and simulator_run', {
'js1_5/extensions/regress-355497': [FAIL_OK, 'Flags: --sim-stack-size=512'],
}], # 'arch == mips64el and simulator_run == True'
}], # 'arch == mips64el and simulator_run'
['arch == mips', {
......@@ -951,13 +951,13 @@
'js1_5/GC/regress-203278-2': [PASS, SLOW, NO_VARIANTS],
}], # 'arch == mips'
['arch == arm and simulator_run == True', {
['arch == arm and simulator_run', {
#BUG(3837): Crashes due to C stack overflow.
'js1_5/extensions/regress-355497': [SKIP],
}], # 'arch == arm and simulator_run == True'
}], # 'arch == arm and simulator_run'
['arch == arm64 and simulator_run == True', {
['arch == arm64 and simulator_run', {
'js1_5/GC/regress-203278-2': [SKIP],
......@@ -979,7 +979,7 @@
#BUG(3152): Avoid C stack overflow.
'js1_5/extensions/regress-355497': [FAIL_OK, 'Flags: --sim-stack-size=512'],
}], # 'arch == arm64 and simulator_run == True'
}], # 'arch == arm64 and simulator_run'
['variant == wasm_traps', {
'*': [SKIP],
......
......@@ -53,9 +53,9 @@
# Skip tests that are too slow for simulators.
'dfg-int-overflow-in-loop': [SKIP],
}], # 'simulator'
['arch == arm64 and simulator_run == True', {
['arch == arm64 and simulator_run', {
'dfg-int-overflow-in-loop': [SKIP],
}], # 'arch == arm64 and simulator_run == True'
}], # 'arch == arm64 and simulator_run'
['dcheck_always_on == True and (arch == arm or arch == arm64)', {
# Doesn't work with gcc 4.6 on arm or arm64 for some reason.
'reentrant-caching': [SKIP],
......@@ -64,7 +64,7 @@
# Too slow for mips big-endian boards on bots (no FPU).
'dfg-int-overflow-in-loop': [SKIP],
}], # 'arch == mips'
['(arch == ppc or arch == ppc64) and simulator_run == True', {
['(arch == ppc or arch == ppc64) and simulator_run', {
# Too slow.
'dfg-int-overflow-in-loop': [SKIP],
}], # 'arch == ppc or arch == ppc64'
......
......@@ -785,7 +785,7 @@ def Execute(arch, mode, args, options, suites):
simulator_run = not options.dont_skip_simulator_slow_tests and \
arch in ['arm64', 'arm', 'mipsel', 'mips', 'mips64', 'mips64el', \
'ppc', 'ppc64', 's390', 's390x'] and \
ARCH_GUESS and arch != ARCH_GUESS
bool(ARCH_GUESS) and arch != ARCH_GUESS
# Find available test suites and read test cases from them.
variables = {
"arch": arch,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment