Index: ppapi/native_client/tests/ppapi_gles_book/nacl.scons |
=================================================================== |
--- ppapi/native_client/tests/ppapi_gles_book/nacl.scons (revision 98628) |
+++ ppapi/native_client/tests/ppapi_gles_book/nacl.scons (working copy) |
@@ -8,8 +8,6 @@ |
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')) |
@@ -59,7 +57,7 @@ |
for demo, sources in gles_book_examples.iteritems(): |
nexe_name = ('ppapi_gles_book_%s_%s' |
% (demo, env.get('TARGET_FULLARCH'))) |
- nmf_name = '${TEST_DIR}/ppapi_gles_book_' + demo + '.nmf' |
+ nmf_name = 'ppapi_gles_book_' + demo + '.nmf' |
nexe = env.ComponentProgram( |
nexe_name, |
['demos/gles2_book/demo_' + demo + '.cc'] + sources, |
@@ -70,11 +68,11 @@ |
'ppapi_gles2', |
'm']) |
env.Publish(nexe_name, 'run', |
- ['ppapi_gles_book.html']) |
+ ['ppapi_gles_book.html', |
+ nmf_name]) |
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')], |