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

Unified Diff: ppapi/native_client/tests/ppapi_gles_book/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_gles_book/nacl.scons
===================================================================
--- ppapi/native_client/tests/ppapi_gles_book/nacl.scons (revision 98496)
+++ ppapi/native_client/tests/ppapi_gles_book/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_gles_book/')
# Underlay $SOURCE_ROOT/gpu in this directory.
Dir('.').addRepository(Dir('#/../gpu'))
@@ -57,7 +59,7 @@
for demo, sources in gles_book_examples.iteritems():
nexe_name = ('ppapi_gles_book_%s_%s'
% (demo, env.get('TARGET_FULLARCH')))
- nmf_name = 'ppapi_gles_book_' + demo + '.nmf'
+ nmf_name = '${TEST_DIR}/ppapi_gles_book_' + demo + '.nmf'
nexe = env.ComponentProgram(
nexe_name,
['demos/gles2_book/demo_' + demo + '.cc'] + sources,
@@ -68,11 +70,11 @@
'ppapi_gles2',
'm'])
env.Publish(nexe_name, 'run',
- ['ppapi_gles_book.html',
- nmf_name])
+ ['ppapi_gles_book.html'])
test = env.PPAPIBrowserTester(
'ppapi_gles_book_' + demo + '.out',
url='ppapi_gles_book.html?manifest=' + nmf_name,
+ nmf=nmf_name,
files=[nexe,
env.File(nmf_name),
env.File('ppapi_gles_book.html')],
« no previous file with comments | « ppapi/native_client/tests/ppapi_geturl/nacl.scons ('k') | ppapi/native_client/tests/ppapi_messaging/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698