Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: tests/multiple_sandboxes/nacl.scons

Issue 9696046: Add test running support for tests generated as pexes. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: suggestions Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tests/multiple_sandboxes/nacl.scons
diff --git a/tests/multiple_sandboxes/nacl.scons b/tests/multiple_sandboxes/nacl.scons
index 0608158eb07101977587a43a641b83cf52bb51b6..a9246a2c4f9a3dd3851b8194ef256da516997e4c 100644
--- a/tests/multiple_sandboxes/nacl.scons
+++ b/tests/multiple_sandboxes/nacl.scons
@@ -46,11 +46,19 @@ test_prog = env.ComponentProgram(
'multidomain_test_guest', ['multidomain_test_guest.c'],
EXTRA_LIBS=['imc_syscalls', '${NONIRT_LIBS}'])
+# If we are generating a pexe, translate it first
+extra_deps = []
+if env.Bit('pnacl_stop_with_pexe'):
+ nexe_name, pexe_node = env.GetTranslatedNexe(test_prog)
+ test_prog = nexe_name
+ extra_deps = [pexe_node]
+
node = env.CommandTest('multidomain_test.out', [runner, test_prog],
# Increase verbosity to get more information in
# the event of a crash.
osenv='NACLVERBOSITY=4',
- stdout_golden=env.File('multidomain_test.stdout'))
+ stdout_golden=env.File('multidomain_test.stdout'),
+ extra_deps=extra_deps)
# This test does not work everywhere:
# * NaCl's ARM sandbox does not support multiple sandboxes per
« tests/minnacl/nacl.scons ('K') | « tests/mmap/nacl.scons ('k') | tests/sysbasic/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698