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

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

Issue 7778012: Landing chrome side of nacl change pre-dating ppapi switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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/ppb_core/nacl.scons
===================================================================
--- ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons (revision 98496)
+++ ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons (working copy)
@@ -8,6 +8,8 @@
Import('env')
env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+ 'ppb_core')
nexe = 'ppapi_ppb_core_%s' % env.get('TARGET_FULLARCH')
env.Alias('ppapi_ppb_core${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
@@ -24,15 +26,16 @@
# Note that the html is required to run this program.
env.Publish(nexe, 'run',
['ppapi_ppb_core.html',
- 'ppapi_ppb_core.nmf',
env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
'browserdata/nacltest.js')])
node = env.PPAPIBrowserTester('ppapi_ppb_core_browser_test.out',
url='ppapi_ppb_core.html',
+ nmf='${TEST_DIR}/ppapi_ppb_core.nmf',
files=env.ExtractPublishedFiles(nexe))
env.AddNodeToTestSuite(node,
['chrome_browser_tests'],
'run_ppapi_ppb_core_browser_test',
- is_broken=env.PPAPIBrowserTesterIsBroken())
+ is_broken=env.PPAPIBrowserTesterIsBroken() or
+ env.Bit('nacl_glibc'))

Powered by Google App Engine
This is Rietveld 408576698