summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authormcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 01:03:06 +0000
committermcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 01:03:06 +0000
commitdaeede2c6d61aee352968e526ae197fc4e69f48f (patch)
treec9a8f8acf0a3688b33fc1c1f657c246afc84468a /ppapi
parent9040db835a0784877594e08ed8cb634375159a2c (diff)
downloadchromium_src-daeede2c6d61aee352968e526ae197fc4e69f48f.zip
chromium_src-daeede2c6d61aee352968e526ae197fc4e69f48f.tar.gz
chromium_src-daeede2c6d61aee352968e526ae197fc4e69f48f.tar.bz2
Fix ppapi/native_client/tests/ppapi_tests/nacl.scons to match test_case.nmf
r110760 broke the scons incarnation of this test by changing the binary names. Make scons produce binaries by the same new names. BUG= 105186 TEST= none R=noelallen@google.com Review URL: http://codereview.chromium.org/8666009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/tests/ppapi_tests/nacl.scons12
1 files changed, 11 insertions, 1 deletions
diff --git a/ppapi/native_client/tests/ppapi_tests/nacl.scons b/ppapi/native_client/tests/ppapi_tests/nacl.scons
index 685ddc8..b590a84 100644
--- a/ppapi/native_client/tests/ppapi_tests/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_tests/nacl.scons
@@ -6,7 +6,17 @@
Import('env')
import os
-ppapi_tests_target = 'ppapi_tests_${TARGET_FULLARCH}'
+if env.Bit('nacl_glibc'):
+ Return()
+
+fullarch_map = {
+ 'x86-64': 'x64',
+ 'x86-32': 'x32',
+ 'arm': 'arm',
+ }
+
+ppapi_tests_target = ('ppapi_tests_newlib_%s' %
+ fullarch_map[env['TARGET_FULLARCH']])
ppapi_tests_sources = [
# Common test files