Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: ppapi/native_client/tests/ppapi_browser/bad/nacl.scons

Issue 10166018: Convert a few more NMF files to be autogenerated and PNaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cannot autogenerate partly_invalid yet... dependency mess Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
index bca20a3585600fd2bc73f7731f9067e781447931..abd6fa639b01829be9165f1d1e17ea78655aaceb 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
@@ -79,6 +79,11 @@ env.AddNodeToTestSuite(node,
# 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}')
@@ -120,5 +125,4 @@ else:
env.AddNodeToTestSuite(node,
['chrome_browser_tests'],
'run_ppapi_bad_native_test',
- is_broken=env.PPAPIBrowserTesterIsBroken() or
- env.Bit('bitcode'))
+ is_broken=env.PPAPIBrowserTesterIsBroken())

Powered by Google App Engine
This is Rietveld 408576698