Get rid of assumptions about ".nexe" extension.

tests/inbrowser_test_runner/nacl.scons

 # -*- python -*-
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 Import('env')
 
 
 env.ComponentLibrary('testrunner', ['test_runner.c'])
 
 
 if env.Bit('bitcode'):
   # The test is disabled for ARM/PNaCl because dynamic_load_test.nexe
   # was disabled for ARM/PNaCl.  TODO(mseaborn): Re-enable both.
   Return()
 
-arch_suffix = '_%s.nexe' % env.get('TARGET_FULLARCH')
+arch_suffix = '_%s' % env.get('TARGET_FULLARCH')
 dest_copy = env.Replicate('$STAGING_DIR', 'test_runner.html')
 env.Replicate('$STAGING_DIR',
               '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js')
 test_files = [
     env.File('$STAGING_DIR/nacltest.js'),
     env.File('$STAGING_DIR/dynamic_load_test.nmf'),
-    env.File('$STAGING_DIR/dynamic_load_test' + arch_suffix),
+    env.File('$STAGING_DIR/dynamic_load_test%s${PROGSUFFIX}' % arch_suffix),

[Nick Bray, 2011/06/23 18:32:24]

Interpolate both the same way?

[pdox, 2011/06/23 20:42:58]

Done.

     env.File('$STAGING_DIR/dynamic_modify_test.nmf'),
-    env.File('$STAGING_DIR/dynamic_modify_test' + arch_suffix),
+    env.File('$STAGING_DIR/dynamic_modify_test%s${PROGSUFFIX}' % arch_suffix),
     env.File('$STAGING_DIR/imc_shm_mmap_test.nmf'),
-    env.File('$STAGING_DIR/imc_shm_mmap_test' + arch_suffix),
+    env.File('$STAGING_DIR/imc_shm_mmap_test%s${PROGSUFFIX}' % arch_suffix),
     ]
 # These are not true dependencies: They are not needed for
 # test_runner.html to be replicated to "staging", but they are needed
 # for test_runner.html to work when run.
 env.Depends(dest_copy, test_files)
 env.Alias('test_runner.html', dest_copy)
 
 node = env.BrowserTester(
     'my_browser_test.out', url='test_runner.html',
     files=[env.File('test_runner.html')] + test_files)
 # Disabling test on mac, see:
 #   http://code.google.com/p/nativeclient/issues/detail?id=1170
 if 'TRUSTED_ENV' in env and not env['TRUSTED_ENV'].Bit('mac'):
   env.AddNodeToTestSuite(node, ['browser_tests'], 'run_inbrowser_test_runner')
 
 node = env.PPAPIBrowserTester(
     'inbrowser_test_runner_chrome.out', url='test_runner.html',
     files=[env.File('test_runner.html')] + test_files,
     args=['--enable_experimental_js'])
 
 env.AddNodeToTestSuite(node, ['chrome_browser_tests'],
                        'run_inbrowser_test_runner_chrome',
                        is_flaky=True, # Don't subject Chrome to our problems.
                        is_broken=env.PPAPIBrowserTesterIsBroken())