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

Unified Diff: src/trusted/service_runtime/build.scons

Issue 7242011: Get rid of assumptions about ".nexe" extension. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 6 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: src/trusted/service_runtime/build.scons
===================================================================
--- src/trusted/service_runtime/build.scons (revision 5756)
+++ src/trusted/service_runtime/build.scons (working copy)
@@ -611,7 +611,7 @@
# Test that sel_ldr does not crash if the executable file cannot be opened.
node = env.CommandSelLdrTestNacl(
'sel_ldr_exe_not_found.out',
- command=['name_of_file_that_does_not_exist.nexe'],
+ 'name_of_file_that_does_not_exist.nexe',
exit_status='1')
env.AddNodeToTestSuite(node, ['small_tests'], 'run_sel_ldr_exe_not_found_test')
@@ -624,8 +624,8 @@
if not env.CrossToolsBuild():
node = env.CommandSelLdrTestNacl(
'fuzz_nullptr_test.out',
+ env.File(arch_testdata_dir + '/nullptr.nexe'),
sel_ldr_flags=['-F'],
- command = [env.File(arch_testdata_dir + '/nullptr.nexe')],
exit_status = '0')
env.AddNodeToTestSuite(node, ['small_tests'], 'run_fuzz_nullptr_test')
@@ -696,7 +696,7 @@
node = env.SelUniversalTest(
test + '_canned.out',
- command = [env.File(arch_testdata_dir + '/' + test + '.nexe')],
+ env.File(arch_testdata_dir + '/' + test + '.nexe'),
stdin = location + '.stdin',
stdout_golden = location + '.stdout',
)
@@ -710,7 +710,7 @@
node = env.CommandSelLdrTestNacl(
'nacl_log.out',
- command = [env.File(arch_testdata_dir + '/hello_world.nexe')],
+ env.File(arch_testdata_dir + '/hello_world.nexe'),
log_golden = env.File('testdata/hello_world.log'),
stdout_golden = env.File('testdata/hello_world.stdout'),
filter_regex = '"' + RE_HELLO + '|' + RE_IDENT + '"',
@@ -753,7 +753,7 @@
node = env.CommandSelLdrTestNacl(
test + '.out',
- command = [env.File(arch_testdata_dir + '/' + test + '.nexe')],
+ env.File(arch_testdata_dir + '/' + test + '.nexe'),
stderr_golden = env.File('testdata/' + test + '.stderr'),
filter_regex = ERROR_WHILE_LOADING,
filter_group_only = 'true',
@@ -765,7 +765,7 @@
# built in tests/nullptr/
node = env.CommandSelLdrTestNacl(
'nullptr.out',
- command=[env.File(arch_testdata_dir + '/nullptr.nexe')],
+ env.File(arch_testdata_dir + '/nullptr.nexe'),
exit_status='untrusted_segfault')
env.AddNodeToTestSuite(node, ['medium_tests'])

Powered by Google App Engine
This is Rietveld 408576698