Index: tests/syscalls/nacl.scons |
=================================================================== |
--- tests/syscalls/nacl.scons (revision 5515) |
+++ tests/syscalls/nacl.scons (working copy) |
@@ -7,6 +7,10 @@ |
Import('env') |
+time_test_is_broken_on_this_os=False |
+if 'TRUSTED_ENV' in env and env['TRUSTED_ENV'].Bit('windows'): |
+ time_test_is_broken_on_this_os=True |
+ |
env.ComponentLibrary('syscall_test_framework', ['test.cc']) |
env.ComponentProgram('syscalls.nexe', |
@@ -122,6 +126,9 @@ |
['small_tests', 'sel_ldr_tests'], |
'run_sysbrk_test') |
+# These are timing tests, so we only run on real hardware |
+is_on_vm = env.Bit('running_on_vm') |
+ |
# additions to add syscall tests 40-42 |
env.ComponentProgram('timefuncs_test.nexe', |
['timefuncs_test.cc'], |
@@ -134,18 +141,17 @@ |
env.AddNodeToTestSuite(node, |
['small_tests', 'sel_ldr_tests'], |
'run_timefuncs_test', |
- ) |
+ is_broken=is_on_vm or time_test_is_broken_on_this_os |
+ ) |
raw_syscall_timefunc_objects = env.RawSyscallObjects(['timefuncs_test.cc']) |
env.ComponentProgram('raw_timefuncs_test.nexe', |
raw_syscall_timefunc_objects, |
EXTRA_LIBS=['syscall_test_framework']) |
-# This is a timing test, so we only run on real hardware |
-is_broken = env.Bit('running_on_vm') |
node = env.CommandSelLdrTestNacl('raw_timefuncs_test.out', |
command=[env.File('raw_timefuncs_test.nexe')]) |
env.AddNodeToTestSuite(node, |
['small_tests', 'sel_ldr_tests'], |
'run_raw_timefuncs_test', |
- is_broken=is_broken) |
+ is_broken=is_on_vm or time_test_is_broken_on_this_os) |