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

Unified Diff: ppapi/native_client/tests/ppapi_example_gles2/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_example_gles2/nacl.scons
===================================================================
--- ppapi/native_client/tests/ppapi_example_gles2/nacl.scons (revision 98496)
+++ ppapi/native_client/tests/ppapi_example_gles2/nacl.scons (working copy)
@@ -8,8 +8,9 @@
Import('env')
env.Prepend(CPPDEFINES=['XP_UNIX'])
-
env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
+ 'ppapi_example_gles2/')
nexe_name = 'ppapi_example_gles2_%s' % env.get('TARGET_FULLARCH')
obj = env.ComponentObject(
@@ -21,10 +22,11 @@
# Note that the html is required to run this program.
env.Publish(nexe_name, 'run',
- ['ppapi_example_gles2.html', 'ppapi_example_gles2.nmf'])
+ ['ppapi_example_gles2.html'])
test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out',
url='ppapi_example_gles2.html',
+ nmf='${TEST_DIR}/ppapi_example_gles2.nmf',
files=env.ExtractPublishedFiles(nexe_name),
args=['--enable_experimental_js'])
@@ -34,4 +36,4 @@
# TODO(cstefansen): When fixed set to
# env.PPAPIBrowserTesterIsBroken().
# code.google.com/p/nativeclient/issues/detail?id=1936
- is_broken=True)
+ is_broken=env.Bit('nacl_glibc'))

Powered by Google App Engine
This is Rietveld 408576698