Convert a few more NMF files to be autogenerated and PNaCl

ppapi/native_client/tests/ppapi_browser/bad/nacl.scons

 # -*- python -*-
 # Copyright (c) 2012 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.
 #
 # Tests fatal errors that occur during loading.
 # (See ppapi_browser/crash for fatal errors that occur after loading).
 # TODO(polina): rename the directory and browser test to bad_load
 #
 # Manual testing with localhost:5103/scons-out/.../staging/ppapi_bad.html:
@@ skipping 61 matching lines @@
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_ppapi_bad_browser_test',
                        is_broken=env.PPAPIBrowserTesterIsBroken() or
                                  env.Bit('host_windows') or
                                  env.Bit('running_on_valgrind'))
 
 
 # Bad nexe tests that won't work in PNaCl (native)
 # For example, partly_invalid.nexe has inline assembly in its source files.
+# Just bail out here for PNaCl, since the NMF will require the .nexe
+# to be built.
+if env.Bit('bitcode'):
+  Return()
+
 nacltest_js = env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/' +
                        'nacltest.js')
 partly_invalid = env.File('${STAGING_DIR}/partly_invalid${PROGSUFFIX}')
 nmf = '${TEST_DIR}/partly_invalid.nmf'
 if not env.Bit('nacl_glibc'):
   ppapi_bad_native_files = [
       env.File('ppapi_bad_native.html'),
       env.File('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
                'ppapi_progress_events.js'),
       nacltest_js]
@@ skipping 21 matching lines @@
       nmfs=[nmf],
       files=ppapi_bad_native_files,
       nacl_exe_stderr={
           'file': '${TARGET_ROOT}/test_results/ppapi_bad_native_test.log',
           'golden': '${TEST_DIR}/ppapi_bad_native_glibc.stderr'}
       )
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_ppapi_bad_native_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken() or
-                                 env.Bit('bitcode'))
+                       is_broken=env.PPAPIBrowserTesterIsBroken())