Index: tests/stubout_mode/nacl.scons |
diff --git a/tests/stubout_mode/nacl.scons b/tests/stubout_mode/nacl.scons |
index dc94213b40c933bdb7415bcbc352b8b04a71cfaa..682e81afbd9b76606bb564397de87cf5a501aeb4 100644 |
--- a/tests/stubout_mode/nacl.scons |
+++ b/tests/stubout_mode/nacl.scons |
@@ -75,16 +75,24 @@ node = env.CommandSelLdrTestNacl( |
env.AddNodeToTestSuite(node, test_suites, 'run_without_stubout_2_test') |
# With "-s", the executable runs part way but then faults. |
+ |
+if env.Bit('target_mips32'): |
+ partly_invalid_exit_status = 'sigtrap' |
+else: |
+ partly_invalid_exit_status = 'untrusted_sigill' |
+ |
node = env.CommandSelLdrTestNacl( |
'partly_invalid_3.out', partly_invalid_nexe, |
stdout_golden=env.File('with_stubout.stdout'), |
sel_ldr_flags=['-s'], |
- exit_status='untrusted_sigill') |
+ exit_status=partly_invalid_exit_status) |
env.AddNodeToTestSuite(node, test_suites, 'run_stubout_mode_test') |
+if not env.Bit('target_mips32'): |
Mark Seaborn
2013/02/13 22:14:09
Use the is_broken argument instead
petarj
2013/03/05 17:50:04
Done.
|
+# There is no stubout tool for MIPS |
# Using the standalone ncval_stubout tool to rewrite the executable |
# offline should be equivalent to using sel_ldr's "-s" option. |
-node = env.CommandSelLdrTestNacl( |
+ node = env.CommandSelLdrTestNacl( |
'partly_invalid_stubout.out', |
partly_invalid_stubout_nexe, |
stdout_golden=env.File('with_stubout.stdout'), |