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

Unified Diff: tests/srpc/nacl.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: tests/srpc/nacl.scons
===================================================================
--- tests/srpc/nacl.scons (revision 5756)
+++ tests/srpc/nacl.scons (working copy)
@@ -12,7 +12,7 @@
# Publish nexes and corresponding html to scons-out/.../staging/
######################################################################
-srpc_test_nexe_name = 'srpc_test_%s.nexe' % env.get('TARGET_FULLARCH')
+srpc_test_nexe_name = 'srpc_test_%s' % env.get('TARGET_FULLARCH')
srpc_test_nexe = env.ComponentProgram(
srpc_test_nexe_name, 'srpc_test.c',
EXTRA_LIBS=[
@@ -31,7 +31,7 @@
env.AddPrebuiltBinaryToRepository(srpc_test_nexe)
-srpc_shm_nexe_name = 'srpc_shm_%s.nexe' % env.get('TARGET_FULLARCH')
+srpc_shm_nexe_name = 'srpc_shm_%s' % env.get('TARGET_FULLARCH')
srpc_shm_nexe = env.ComponentProgram(
srpc_shm_nexe_name, 'srpc_shm.c',
EXTRA_LIBS=['${NON_PPAPI_BROWSER_LIBS}',
@@ -42,7 +42,7 @@
env.AddPrebuiltBinaryToRepository(srpc_shm_nexe)
-srpc_nrd_server_nexe_name = ('srpc_nrd_server_%s.nexe' %
+srpc_nrd_server_nexe_name = ('srpc_nrd_server_%s' %
env.get('TARGET_FULLARCH'))
srpc_nrd_server_nexe = env.ComponentProgram(
srpc_nrd_server_nexe_name, 'srpc_nrd_server.c',
@@ -60,7 +60,7 @@
env.AddPrebuiltBinaryToRepository(srpc_nrd_server_nexe)
-srpc_nrd_client_nexe_name = ('srpc_nrd_client_%s.nexe' %
+srpc_nrd_client_nexe_name = ('srpc_nrd_client_%s' %
env.get('TARGET_FULLARCH'))
srpc_nrd_client_nexe = env.ComponentProgram(
srpc_nrd_client_nexe_name, 'srpc_nrd_client.c',
@@ -80,7 +80,7 @@
env.AddPrebuiltBinaryToRepository(srpc_nrd_client_nexe)
-cat_nexe_name = ('cat_%s.nexe' % env.get('TARGET_FULLARCH'))
+cat_nexe_name = ('cat_%s' % env.get('TARGET_FULLARCH'))
cat_nexe = env.ComponentProgram(
cat_nexe_name, 'cat.c',
EXTRA_LIBS=['${NON_PPAPI_BROWSER_LIBS}',
@@ -91,7 +91,7 @@
'cat.nmf'])
-srpc_bidir_nexe_name = ('srpc_bidir_%s.nexe' % env.get('TARGET_FULLARCH'))
+srpc_bidir_nexe_name = ('srpc_bidir_%s' % env.get('TARGET_FULLARCH'))
srpc_bidir_nexe = env.ComponentProgram(
srpc_bidir_nexe_name, 'srpc_bidir.c',
EXTRA_LIBS=['srpc', 'imc_syscalls', 'platform', 'gio', 'm', 'pthread'])
@@ -100,7 +100,7 @@
# NOTE: at least for ARM the EXTRA_LIBS list should include 'srpc'
# but this somehow make the x86 version fragile
-srpc_bad_service_nexe_name = ('srpc_bad_service_%s.nexe' %
+srpc_bad_service_nexe_name = ('srpc_bad_service_%s' %
env.get('TARGET_FULLARCH'))
srpc_bad_service_nexe = env.ComponentProgram(
srpc_bad_service_nexe_name, 'srpc_bad_service.c',
@@ -113,8 +113,8 @@
node = env.SelUniversalTest(
'srpc_basic_test.out',
+ srpc_test_nexe,
sel_universal_flags=['--command_file', env.File('srpc_basic_test.stdin')],
- command=[srpc_test_nexe],
stdout_golden=env.File('srpc_basic_test.stdout'),
)
env.AddNodeToTestSuite(node,
@@ -123,9 +123,9 @@
node = env.SelUniversalTest(
'srpc_shm_test.out',
+ srpc_shm_nexe,
sel_universal_flags=['--command_file',
env.File('srpc_shm_test.stdin')],
- command=[srpc_shm_nexe],
stdout_golden=env.File('srpc_shm_test.stdout'),
)
env.AddNodeToTestSuite(node,
@@ -134,7 +134,7 @@
node = env.SelUniversalTest(
'srpc_bad_service.out',
- command=[srpc_bad_service_nexe],
+ srpc_bad_service_nexe,
exit_status='1'
)
env.AddNodeToTestSuite(node,

Powered by Google App Engine
This is Rietveld 408576698