Fix ppapi/native_client/tests/ppapi_tests/nacl.scons to match test_case.nmf

ppapi/native_client/tests/ppapi_tests/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')
 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
     'test_case.cc',
     'test_utils.cc',
     'testing_instance.cc',
 
     # Compile-time tests
     'test_c_includes.c',
     'test_cpp_includes.cc',
@@ skipping 76 matching lines @@
 env.Publish(ppapi_tests_target, 'run',
             ['$SOURCE_ROOT/ppapi/tests/test_url_loader_data/*'],
             subdir='test_url_loader_data')
 
 env.Publish(ppapi_tests_target, 'run',
             [ppapi_tests_nexe,
              '$SOURCE_ROOT/ppapi/tests/test_case.html',
              'test_case.nmf',
              '$SOURCE_ROOT/ppapi/tests/test_image_data',
              '$SOURCE_ROOT/ppapi/tests/test_page.css'])