Remove some old support for PNaCl Scons browser tests.

We no longer run scons nacl_integration tests w/ PNaCl.

This allows us to get rid of $GENNMF from Scons and remove
the unused pnacl-nmf.py driver script from the toolchain
tarball.  Devs can use create_nmf.py instead from the SDK.

BUG=none
R=mseaborn@chromium.org

Review URL: https://codereview.chromium.org/20370002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213719 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 16 insertions, 68 deletions

diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons
index d36bc76..2a8f0ba 100644
--- a/ppapi/native_client/chrome_main.scons
+++ b/ppapi/native_client/chrome_main.scons
@@ -173,9 +173,6 @@ def CopyLibsForExtensionCommand(target, source, env):
     lib_info = ParseLibInfoInRunnableLdLog(line)
     if lib_info:
       lib_name, lib_path = lib_info
-      # Note: This probably does NOT work with pnacl _pexes_ right now, because
-      # the NEEDED metadata in the bitcode doesn't have the original file paths.
-      # This should probably be done without such knowledge.
       if lib_path == 'NaClMain':
         # This is a fake file name, which we cannot copy.
         continue
@@ -292,13 +289,6 @@ def GenerateManifestFunc(target, source, env):
   target_file.close()
   return 0
 
-def GenerateManifestPnacl(env, dest_file, manifest, exe_file):
-  return env.Command(
-      dest_file,
-      ['${GENNMF}', exe_file, manifest],
-      # Generate a flat url scheme to simplify file-staging.
-      ('${SOURCES[0]} ${SOURCES[1]} -L${NACL_SDK_LIB} -L${LIB_DIR} '
-       ' --flat-url-scheme --base-nmf ${SOURCES[2]} -o ${TARGET}'))
 
 def GenerateManifestDynamicLink(env, dest_file, lib_list_file,
                                 manifest, exe_file):
@@ -336,13 +326,7 @@ def GenerateSimpleManifestStaticLink(env, dest_file, exe_name):
 
 
 def GenerateSimpleManifest(env, dest_file, exe_name):
-  if env.Bit('pnacl_generate_pexe'):
-    static_manifest = GenerateSimpleManifestStaticLink(
-        env, '%s.static' % dest_file, exe_name)
-    return GenerateManifestPnacl(env, dest_file, static_manifest,
-                                 '${STAGING_DIR}/%s.pexe' %
-                                 env.ProgramNameForNmf(exe_name))
-  elif env.Bit('nacl_static_link'):
+  if env.Bit('nacl_static_link'):
     return GenerateSimpleManifestStaticLink(env, dest_file, exe_name)
   else:
     static_manifest = GenerateSimpleManifestStaticLink(
@@ -359,10 +343,7 @@ pre_base_env.AddMethod(GenerateSimpleManifest)
 def GetMainProgramFromManifest(env, manifest):
   obj = json.loads(env.File(manifest).get_contents())
   program_dict = obj['program']
-  if env.Bit('pnacl_generate_pexe') and 'portable' in program_dict:
-    return program_dict['portable']['pnacl-translate']['url']
-  else:
-    return program_dict[env.subst('${TARGET_FULLARCH}')]['url']
+  return program_dict[env.subst('${TARGET_FULLARCH}')]['url']
 
 
 # Returns scons node for generated manifest.
@@ -371,26 +352,18 @@ def GeneratedManifestNode(env, manifest):
   manifest_base_name = os.path.basename(manifest)
   main_program = GetMainProgramFromManifest(env, manifest)
   result = env.File('${STAGING_DIR}/' + manifest_base_name)
-  # Always generate the manifest for nacl_glibc and pnacl pexes.
+  # Always generate the manifest for nacl_glibc.
   # For nacl_glibc, generating the mapping of shared libraries is non-trivial.
-  # For pnacl, the manifest currently hosts a sha for the pexe.
-  if not env.Bit('nacl_glibc') and not env.Bit('pnacl_generate_pexe'):
+  if not env.Bit('nacl_glibc'):
     env.Install('${STAGING_DIR}', manifest)
     return result
-  if env.Bit('pnacl_generate_pexe'):
-    return GenerateManifestPnacl(
-        env,
-        '${STAGING_DIR}/' + manifest_base_name,
-        manifest,
-        env.File('${STAGING_DIR}/' + os.path.basename(main_program)))
-  else:
-    return GenerateManifestDynamicLink(
-        env, '${STAGING_DIR}/' + manifest_base_name,
-        # Note that CopyLibsForExtension() and WhitelistLibsForExtension()
-        # assume that it can find the library list file under this filename.
-        GlibcManifestLibsListFilename(manifest_base_name),
-        manifest,
-        env.File('${STAGING_DIR}/' + os.path.basename(main_program)))
+  return GenerateManifestDynamicLink(
+      env, '${STAGING_DIR}/' + manifest_base_name,
+      # Note that CopyLibsForExtension() and WhitelistLibsForExtension()
+      # assume that it can find the library list file under this filename.
+      GlibcManifestLibsListFilename(manifest_base_name),
+      manifest,
+      env.File('${STAGING_DIR}/' + os.path.basename(main_program)))
   return result
 
 
@@ -461,10 +434,6 @@ def PPAPIBrowserTester(env,
   if browser_flags is None:
     browser_flags = []
 
-  if env.Bit('pnacl_generate_pexe'):
-    # We likely prefer to choose the 'portable' field in nmfs in this mode.
-    args = args + ['--prefer_portable_in_manifest']
-
   # Lint the extra arguments that are being passed to the tester.
   special_args = ['--ppapi_plugin', '--sel_ldr', '--irt_library', '--file',
                   '--map_file', '--extension', '--mime_type', '--tool',
diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
index 4089c06..f3ce99a 100644
--- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
+++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
@@ -51,8 +51,6 @@ env.AddNodeToTestSuite(
 # This crash in trusted code should produce a crash dump.
 # DISABLED due to flakiness (http://crbug.com/247114).
 # crash_test_url = 'trusted_crash_in_startup.html'
-# if env.Bit('pnacl_generate_pexe'):
-#   crash_test_url += '?is_pnacl=true'
 # node = env.PPAPIBrowserTester(
 #     'breakpad_trusted_crash_in_startup_test.out',
 #     python_tester_script=env.File('crash_dump_tester.py'),
diff --git a/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html b/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html
index 509f437..94b5d496 100644
--- a/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html
+++ b/ppapi/native_client/tests/breakpad_crash_test/trusted_crash_in_startup.html
@@ -41,19 +41,11 @@ tester.addAsyncTest('trusted_crash_during_startup', function(status) {
     status.log('Received error: ' + error);
     // This error occurs only because NACL_CRASH_TEST is set.  We would
     // not normally expect to get this error in the browser.
-    // For PNaCl, the crash will occur while starting the compiler process.
-    var test_args = getTestArguments({ 'is_pnacl': 'false' });
-    if (test_args['is_pnacl'] != 'false') {
-      var expected_error = ('NaCl module load failed: PnaclCoordinator: ' +
-                            'Compile process could not be created');
-      status.assert(begins_with(embed.lastError, expected_error));
-    } else {
-      var expected_error_prefix = 'NaCl module load failed: ServiceRuntime: ';
-      var suffix1 = 'command channel creation failed';
-      var suffix2 = 'failed to start';
-      status.assert(error == expected_error_prefix + suffix1 ||
-                    error == expected_error_prefix + suffix2);
-    }
+    var expected_error_prefix = 'NaCl module load failed: ServiceRuntime: ';
+    var suffix1 = 'command channel creation failed';
+    var suffix2 = 'failed to start';
+    status.assert(error == expected_error_prefix + suffix1 ||
+                  error == expected_error_prefix + suffix2);
     status.pass();
   }), true);
 
diff --git a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
index 4731ff3..7fca293 100644
--- a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
@@ -10,11 +10,6 @@
 
 Import('env')
 
-# TODO(jvoung): Make a pnacl version of the nmf / or make the pexe generator
-# compatible with CopyLibsForExtension().
-if env.Bit('pnacl_generate_pexe'):
-  Return()
-
 env.Prepend(CPPDEFINES=['XP_UNIX'])
 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
                      'extension_mime_handler')
diff --git a/ppapi/native_client/tools/browser_tester/browser_tester.py b/ppapi/native_client/tools/browser_tester/browser_tester.py
index 2bf3614..513a091 100755
--- a/ppapi/native_client/tools/browser_tester/browser_tester.py
+++ b/ppapi/native_client/tools/browser_tester/browser_tester.py
@@ -56,10 +56,6 @@ def BuildArgParser():
                     metavar='DEST SRC',
                     help='Add a redirect to the HTTP server, '
                     'requests for SRC will result in a redirect (302) to DEST.')
-  parser.add_option('--prefer_portable_in_manifest',
-                    dest='prefer_portable_in_manifest',
-                    action='store_true', default=False,
-                    help='Use portable programs in manifest if available.')
   parser.add_option('-f', '--file', dest='files', action='append',
                     type='string', default=[],
                     metavar='FILENAME',
diff --git a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
index 44d38af..256a1cb 100755
--- a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
+++ b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
@@ -188,8 +188,6 @@ class BrowserLauncher(object):
       env['NACL_SEL_LDR_BOOTSTRAP'] = self.options.sel_ldr_bootstrap
     if self.options.irt_library:
       env['NACL_IRT_LIBRARY'] = self.options.irt_library
-    if self.options.prefer_portable_in_manifest:
-      env['NACL_PREFER_PORTABLE_IN_MANIFEST'] = '1'
     self.SetStandardStream(env, 'NACL_EXE_STDIN',
                            self.options.nacl_exe_stdin, False)
     self.SetStandardStream(env, 'NACL_EXE_STDOUT',