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

Unified Diff: tests/ppapi_browser/manifest/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/ppapi_browser/manifest/nacl.scons
===================================================================
--- tests/ppapi_browser/manifest/nacl.scons (revision 5756)
+++ tests/ppapi_browser/manifest/nacl.scons (working copy)
@@ -11,7 +11,7 @@
manifest_good_sources = env.ComponentObject('manifest_good.cc'),
-manifest_good_target = ('manifest_good_%s.nexe' %
+manifest_good_target = ('manifest_good_%s' %
env.get('TARGET_FULLARCH'))
env.ComponentProgram(manifest_good_target,
[manifest_good_sources],
@@ -23,7 +23,7 @@
manifest_bad_sources = env.ComponentObject('manifest_bad.cc'),
-manifest_bad_target = ('manifest_bad_%s.nexe' %
+manifest_bad_target = ('manifest_bad_%s' %
env.get('TARGET_FULLARCH'))
env.ComponentProgram(manifest_bad_target,
[manifest_bad_sources],
@@ -52,12 +52,12 @@
env.File('${STAGING_DIR}/manifest_subdir.nmf'),
# the 'good' nexe in the root directory will fail.
'--map_file',
- manifest_good_target,
- env.File('${STAGING_DIR}/' + manifest_bad_target),
+ manifest_good_target + env['PROGSUFFIX'],
+ env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target),
# the 'good' nexe in the subdirectory will succeed.
'--map_file',
- 'subdir/' + manifest_good_target,
- env.File('${STAGING_DIR}/' + manifest_good_target)])
+ 'subdir/' + manifest_good_target + env['PROGSUFFIX'],
+ env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target)])
env.AddNodeToTestSuite(node,
['chrome_browser_tests'],

Powered by Google App Engine
This is Rietveld 408576698