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

Unified Diff: tests/debug_stub/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
« no previous file with comments | « tests/data_not_executable/nacl.scons ('k') | tests/dup/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/debug_stub/nacl.scons
===================================================================
--- tests/debug_stub/nacl.scons (revision 5777)
+++ tests/debug_stub/nacl.scons (working copy)
@@ -21,7 +21,7 @@
if env.Bit('bitcode'):
Return()
-test_prog = env.ComponentProgram('debugger_test.nexe', 'debugger_test.c')
+test_prog = env.ComponentProgram('debugger_test', 'debugger_test.c')
sel_ldr = trusted_env.File('${STAGING_DIR}/${PROGPREFIX}sel_ldr${PROGSUFFIX}')
env_vars = [
@@ -46,15 +46,13 @@
is_broken = not env.Bit('host_windows')
# Build .nexe to be used with debug_in_browswer test
-browser_test_target = 'debug_browser_test_%s.nexe' % env.get('TARGET_FULLARCH')
+browser_test_target = 'debug_browser_test_%s' % env.get('TARGET_FULLARCH')
browser_test_nexe = env.ComponentProgram(browser_test_target,
['debug_browser_test.cc'],
EXTRA_LIBS=['${PPAPI_LIBS}',
'ppapi_cpp']
)
-arch_suffix = '_%s.nexe' % env.get('TARGET_FULLARCH')
-
# Note that the html and a .nmf manifest is required to run this program.
dest_copy = env.Replicate('$STAGING_DIR',
['debug_browser.html',
@@ -67,7 +65,7 @@
env.File('$STAGING_DIR/nacltest.js'),
env.File('$STAGING_DIR/debug_browser_test.nmf'),
env.File('$STAGING_DIR/debug_browser.html'),
- env.File('$STAGING_DIR/debug_browser_test' + arch_suffix),
+ env.File('$STAGING_DIR/%s${PROGSUFFIX}' % browser_test_target),
]
# For now, we have to force this test to always run using chrome's
« no previous file with comments | « tests/data_not_executable/nacl.scons ('k') | tests/dup/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698