Enable browser tests with glibc, part 2.

Full CL is here: http://codereview.chromium.org/7745047/
This is a copy of http://codereview.chromium.org/7794022/ which has wrong base URL.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=2210

Review URL: http://codereview.chromium.org/7827043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99389 0039d316-1c4b-4281-b951-d872f2087c98

30 files changed, 144 insertions, 69 deletions

diff --git a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
index 1ee6714..b9cc837 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
@@ -18,6 +18,8 @@ Import('env')
 # TODO(robertm): those should not be necessary once we go -std=c99
 env.FilterOut(CFLAGS=['-pedantic'])
 env.FilterOut(CCFLAGS=['-pedantic'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'bad')
 
 ppapi_bad_files = [
   'ppapi_bad.html',
@@ -32,7 +34,7 @@ ppapi_bad_files = [
   ]
 ppapi_bad = env.Replicate('${STAGING_DIR}', ppapi_bad_files)
 
-
+nmfs = []
 # Compile all nexes embedded into the above html
 for kind in [ 'ppp_initialize', 'ppp_initialize_crash',
               'no_ppp_instance', 'get_ppp_instance_crash',
@@ -40,7 +42,7 @@ for kind in [ 'ppp_initialize', 'ppp_initialize_crash',
               'ppp_instance_didcreate', 'ppp_instance_didcreate_crash',
               'event_replay_crash'
               ]:
-  bad_nmf = 'ppapi_bad_%s.nmf' % kind
+  bad_nmf = '${TEST_DIR}/ppapi_bad_%s.nmf' % kind
   bad_nexe = ('ppapi_bad_%s_%s' % (kind, env.get('TARGET_FULLARCH')))
   env.ComponentProgram(bad_nexe,
                        ['ppapi_bad_%s.cc' % kind],
@@ -48,8 +50,7 @@ for kind in [ 'ppp_initialize', 'ppp_initialize_crash',
                                    'platform',
                                    'pthread',
                                    'gio'])
-
-  env.Publish(bad_nexe, 'run', [bad_nmf])
+  nmfs.append(bad_nmf)
   ppapi_bad_files.extend(env.ExtractPublishedFiles(bad_nexe))
   env.Depends(ppapi_bad, env.Alias(bad_nexe))
 
@@ -60,21 +61,21 @@ env.Alias('ppapi_bad', ppapi_bad)
 node = env.PPAPIBrowserTester(
     'ppapi_bad_browser_test.out',
     url='ppapi_bad.html',
+    nmfs=nmfs,
     files=[env.File(f) for f in ppapi_bad_files],
     args=['--allow_404'])
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_ppapi_bad_browser_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken())
+                       is_broken=env.PPAPIBrowserTesterIsBroken() or
+                                 env.Bit('nacl_glibc'))
 
 
 # Bad nexe tests that won't work in PNaCl (native)
 # For example, partly_invalid.nexe has inline assembly in its source files.
-
 ppapi_bad_native_files = [
   env.File('ppapi_bad_native.html'),
-  env.File('partly_invalid.nmf'),
   env.File('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
            'ppapi_progress_events.js'),
   env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js')
@@ -88,11 +89,13 @@ ppapi_bad_native_files.append(partly_invalid)
 node = env.PPAPIBrowserTester(
     'ppapi_bad_native_test.out',
     url='ppapi_bad_native.html',
+    nmfs=['${TEST_DIR}/partly_invalid.nmf'],
     files=ppapi_bad_native_files,
     )
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
-                       'run_ppapi_bad_native_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken() or
-                                 env.Bit('bitcode'))
+                        'run_ppapi_bad_native_test',
+                         is_broken=env.PPAPIBrowserTesterIsBroken() or
+                                   env.Bit('nacl_glibc') or
+                                   env.Bit('bitcode'))
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons b/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons
index 2f942e1..bb90de0 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons
@@ -11,6 +11,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(
+    TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/crash')
 
 crash_types = ['via_check_failure',
                'via_exit_call',
@@ -19,6 +21,7 @@ crash_types = ['via_check_failure',
                'ppapi_off_main_thread']
 published_files = []
 
+nmfs = []
 for crash_type in crash_types:
   nexe = 'ppapi_crash_%s_%s' % (crash_type, env.get('TARGET_FULLARCH'))
   env.Alias('ppapi_crash_%s${PROGSUFFIX}' % crash_type,
@@ -36,17 +39,19 @@ for crash_type in crash_types:
 # TODO(polina): follow ppapi_browser/bad nacl.scons to publish html only once
 # and to associate all nexes and nmf files with one target that can be
 # referenced in tests/nacl.scons.
+  nmfs.append('${TEST_DIR}/ppapi_crash_%s.nmf' % crash_type)
   env.Publish(nexe, 'run',
-              ['ppapi_crash.html',
-               'ppapi_crash_%s.nmf' % crash_type ])
+              ['ppapi_crash.html'])
 
   published_files.extend(env.ExtractPublishedFiles(nexe))
 
 node = env.PPAPIBrowserTester('ppapi_crash_browser_test.out',
                               url='ppapi_crash.html',
+                              nmfs=nmfs,
                               files=published_files)
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_ppapi_crash_browser_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken())
+                       is_broken=env.PPAPIBrowserTesterIsBroken() or
+                                 env.Bit('nacl_glibc'))
diff --git a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
index 537d8bc..39f9e48 100644
--- a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
@@ -13,6 +13,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'extension_mime_handler')
 
 nexe = 'ppapi_extension_mime_handler_%s' % env.get('TARGET_FULLARCH')
 
@@ -27,9 +29,11 @@ env.ComponentProgram(
 
 # Copy the extension into place (as a subdir in the staging dir).
 dest_copy = env.Replicate('$STAGING_DIR/ppapi_extension_mime_handler',
-                          ['ppapi_extension_mime_handler.nmf',
-                           'manifest.json',
+                          ['manifest.json',
                            env.File('$STAGING_DIR/' + nexe + '$PROGSUFFIX')])
+dest_copy.append(env.CopyLibsForExtension(
+    '$STAGING_DIR/ppapi_extension_mime_handler',
+    '$STAGING_DIR/ppapi_extension_mime_handler.nmf'))
 
 env.Depends(env.Alias(nexe), dest_copy)
 
@@ -40,6 +44,7 @@ env.Publish(nexe, 'run',
 
 node = env.PPAPIBrowserTester('ppapi_extension_mime_handler.out',
     url='ppapi_extension_mime_handler.html',
+    nmfs=['${TEST_DIR}/ppapi_extension_mime_handler.nmf'],
     extensions=[env.Dir('$STAGING_DIR/ppapi_extension_mime_handler')],
     files=env.ExtractPublishedFiles(nexe))
 
diff --git a/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons b/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons
index 27a28ae..51edd64 100644
--- a/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons
@@ -8,6 +8,8 @@ Import('env')
 # TODO(robertm): those should not be necessary once we go -std=c99
 env.FilterOut(CFLAGS=['-pedantic'])
 env.FilterOut(CCFLAGS=['-pedantic'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'manifest')
 
 manifest_good_sources = env.ComponentObject('manifest_good.cc'),
 
@@ -36,26 +38,31 @@ env.ComponentProgram(manifest_bad_target,
 env.Publish(manifest_good_target, 'run', [
     'manifest.html',
     manifest_bad_target,
-    'manifest_top.nmf',
-    'manifest_subdir.nmf',
     ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
      'ppapi_progress_events.js'),
     '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',
 ])
 
+file_mapping = []
+if env.Bit('nacl_glibc'):
+  file_mapping.append(
+      ('subdir/runnable-ld.so',env.File('${NACL_SDK_LIB}/runnable-ld.so')))
+file_mapping += [
+    ('subdir/manifest_subdir.nmf',
+    env.File('${STAGING_DIR}/manifest_subdir.nmf')),
+    # the 'good' nexe in the root directory will fail.
+    (manifest_good_target + env['PROGSUFFIX'],
+    env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),
+    # the 'good' nexe in the subdirectory will succeed.
+    ('subdir/' + manifest_good_target + env['PROGSUFFIX'],
+    env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))]
+
 node = env.PPAPIBrowserTester(
     'manifest_browser_test.out',
     url='manifest.html',
+    nmfs=['${TEST_DIR}/manifest_top.nmf', '${TEST_DIR}/manifest_subdir.nmf'],
     files=env.ExtractPublishedFiles(manifest_good_target),
-    map_files=[
-        ('subdir/manifest_subdir.nmf',
-        env.File('${STAGING_DIR}/manifest_subdir.nmf')),
-        # the 'good' nexe in the root directory will fail.
-        (manifest_good_target + env['PROGSUFFIX'],
-        env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),
-        # the 'good' nexe in the subdirectory will succeed.
-        ('subdir/' + manifest_good_target + env['PROGSUFFIX'],
-        env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))])
+    map_files=file_mapping)
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons
index eb6aa92..b08a465 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons
@@ -8,9 +8,12 @@
 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])
+env.Alias('ppapi_ppb_core${PROGSUFFIX}', 
+          ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
 
 env.ComponentProgram(
     nexe,
@@ -24,15 +27,16 @@ env.ComponentProgram(
 # 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',
+                              nmfs=['${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'))
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons
index a07e0ee..235d957 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_dev')
 
 nexe = 'ppapi_ppb_dev_${TARGET_FULLARCH}'
 env.Alias('ppapi_ppb_dev${PROGSUFFIX}',
@@ -25,12 +27,12 @@ env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             [ 'ppapi_ppb_dev.html',
-              'ppapi_ppb_dev.nmf',
               env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                   'browserdata/nacltest.js') ])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_dev_browser_test.out',
                               url='ppapi_ppb_dev.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_dev.nmf'],
                               files=env.ExtractPublishedFiles(nexe),
                               args=['--enable_ppapi_dev=0'])
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons
index 28ef8ef..0a7af63 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_file_io')
 
 nexe = 'ppapi_ppb_file_io_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_file_io${PROGSUFFIX}',
@@ -28,11 +30,11 @@ env.ComponentProgram(nexe,
 
 env.Publish(nexe, 'run',
             ['ppapi_ppb_file_io.html',
-             'ppapi_ppb_file_io.nmf',
              'ppapi_ppb_file_io.js'])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_file_io_browser_test.out',
                               url='ppapi_ppb_file_io.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_file_io.nmf'],
                               browser_flags=['--unlimited-quota-for-files'],
                               files=env.ExtractPublishedFiles(nexe))
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons
index 9a04c5a..8e3ffd9 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_file_system')
 
 nexe = 'ppapi_ppb_file_system_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_file_system${PROGSUFFIX}',
@@ -23,14 +25,15 @@ env.ComponentProgram(nexe,
 
 env.Publish(nexe, 'run',
             ['ppapi_ppb_file_system.html',
-             'ppapi_ppb_file_system.nmf',
              'ppapi_ppb_file_system.js'])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_file_system_browser_test.out',
                               url='ppapi_ppb_file_system.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_file_system.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_ppapi_ppb_file_system_browser_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken())
+                       is_broken=env.PPAPIBrowserTesterIsBroken() or
+                                 env.Bit('nacl_glibc'))
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons
index 82e7aa8..4d4ed4e 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_graphics2d')
 
 nexe = 'ppapi_ppb_graphics2d_${TARGET_FULLARCH}'
 env.Alias('ppapi_ppb_graphics2d${PROGSUFFIX}',
@@ -25,15 +27,14 @@ ppapi_ppb_graphics2d_nexe = env.ComponentProgram(
 
 dest_copy = env.Publish(nexe, 'run',
                           [ 'ppapi_ppb_graphics2d.html',
-                            'ppapi_ppb_graphics2d.nmf',
                             env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                                      'browserdata/nacltest.js') ]
                           )
 
 node = env.PPAPIBrowserTester('ppapi_ppb_graphics2d_browser_test.out',
                               url='ppapi_ppb_graphics2d.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_graphics2d.nmf'],
                               files=[ ppapi_ppb_graphics2d_nexe,
-                                      env.File('ppapi_ppb_graphics2d.nmf'),
                                       env.File('ppapi_ppb_graphics2d.html')],
                               browser_flags=['--enable-pepper-testing'])
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons
index 3e07d52..5a9c8e0 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_graphics3d')
 
 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
 
@@ -28,14 +30,13 @@ ppapi_ppb_graphics3d_nexe = env.ComponentProgram(
 
 dest_copy = env.Publish(nexe, 'run',
                         [ 'ppapi_ppb_graphics3d.html',
-                          'ppapi_ppb_graphics3d.nmf',
                           env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                                    'browserdata/nacltest.js') ])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out',
                               url='ppapi_ppb_graphics3d.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_graphics3d.nmf'],
                               files=[ ppapi_ppb_graphics3d_nexe,
-                                      env.File('ppapi_ppb_graphics3d.nmf'),
                                       env.File('ppapi_ppb_graphics3d.html')],
                               browser_flags=['--enable-accelerated-plugins'])
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons
index 8b41021..33a01f3 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_image_data')
 
 nexe = 'ppapi_ppb_image_data_${TARGET_FULLARCH}'
 env.Alias('ppapi_ppb_image_data${PROGSUFFIX}',
@@ -25,12 +27,12 @@ env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             [ 'ppapi_ppb_image_data.html',
-              'ppapi_ppb_image_data.nmf',
               env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                   'browserdata/nacltest.js') ])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_image_data_browser_test.out',
                               url='ppapi_ppb_image_data.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_image_data.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons
index bf8727f5..30d8e1f 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_instance')
 
 nexe = 'ppapi_ppb_instance_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_instance${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
@@ -24,12 +26,12 @@ env.ComponentProgram(
 # Note that the html is required to run this program.
 env.Publish(nexe, 'run',
             ['ppapi_ppb_instance.html',
-             'ppapi_ppb_instance.nmf',
              env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                       'browserdata/nacltest.js')])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_instance_browser_test.out',
                               url='ppapi_ppb_instance.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_instance.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons
index 4af6801..b16f01f 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_memory')
 
 nexe = 'ppapi_ppb_memory_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_memory${PROGSUFFIX}',
@@ -24,11 +26,11 @@ ppapi_ppb_memory_nexe = env.ComponentProgram(
                 ])
 
 env.Publish(nexe, 'run',
-            ['ppapi_ppb_memory.html',
-             'ppapi_ppb_memory.nmf'])
+            ['ppapi_ppb_memory.html'])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_memory_browser_test.out',
                               url='ppapi_ppb_memory.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_memory.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons
index 4643058..6768fba 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons
@@ -7,6 +7,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_pdf')
 
 nexe = 'ppapi_ppb_pdf_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_pdf${PROGSUFFIX}',
@@ -24,11 +26,11 @@ ppapi_ppb_pdf_nexe = env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             ['ppapi_ppb_pdf.html',
-             'ppapi_ppb_pdf.nmf',
              'ppapi_ppb_pdf.js'])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_pdf_browser_test.out',
                               url='ppapi_ppb_pdf.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_pdf.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons
index ca47ed1..86436f2 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons
@@ -7,6 +7,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_scrollbar')
 
 nexe = 'ppapi_ppb_scrollbar_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_scrollbar${PROGSUFFIX}',
@@ -24,11 +26,11 @@ ppapi_ppb_scrollbar_nexe = env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             ['ppapi_ppb_scrollbar.html',
-             'ppapi_ppb_scrollbar.nmf',
              'ppapi_ppb_scrollbar.js'])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_scrollbar_browser_test.out',
                               url='ppapi_ppb_scrollbar.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_scrollbar.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons
index 340db24..9308de2 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_url_loader')
 
 nexe = 'ppapi_ppb_url_loader_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_url_loader${PROGSUFFIX}',
@@ -23,12 +25,12 @@ env.ComponentProgram(nexe,
 
 env.Publish(nexe, 'run',
             ['ppapi_ppb_url_loader.html',
-             'ppapi_ppb_url_loader.nmf',
              'ppapi_ppb_url_loader.js',
              'ppapi_ppb_url_loader.txt'])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_url_loader_browser_test.out',
                               url='ppapi_ppb_url_loader.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_url_loader.nmf'],
                               files=env.ExtractPublishedFiles(nexe),
                               args=['--allow_404',
                                     '--redirect_url',
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
index 8428117..cb4abc9 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_url_request_info')
 
 nexe = 'ppapi_ppb_url_request_info_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_url_request_info${PROGSUFFIX}',
@@ -25,13 +27,14 @@ ppapi_ppb_url_request_info_nexe = env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             ['ppapi_ppb_url_request_info.html',
-             'ppapi_ppb_url_request_info.nmf',
              'ppapi_ppb_url_request_info.js'])
 
-node = env.PPAPIBrowserTester('ppapi_ppb_url_request_info_browser_test.out',
-                              url='ppapi_ppb_url_request_info.html',
-                              files=env.ExtractPublishedFiles(nexe),
-                              browser_flags=['--enable-pepper-testing'])
+node = env.PPAPIBrowserTester(
+    'ppapi_ppb_url_request_info_browser_test.out',
+    url='ppapi_ppb_url_request_info.html',
+    nmfs=['${TEST_DIR}/ppapi_ppb_url_request_info.nmf'],
+    files=env.ExtractPublishedFiles(nexe),
+    browser_flags=['--enable-pepper-testing'])
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons
index 75398c5..33faa8c 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_var')
 
 nexe = 'ppapi_ppb_var_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
@@ -24,12 +26,12 @@ env.ComponentProgram(
 # Note that the html is required to run this program.
 env.Publish(nexe, 'run',
             ['ppapi_ppb_var.html',
-             'ppapi_ppb_var.nmf',
              env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                       'browserdata/nacltest.js')])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out',
                               url='ppapi_ppb_var.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_var.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons
index 2362fbb..5ec2571 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons
@@ -7,6 +7,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppb_widget')
 
 nexe = 'ppapi_ppb_widget_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppb_widget${PROGSUFFIX}',
@@ -24,11 +26,11 @@ ppapi_ppb_widget_nexe = env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             ['ppapi_ppb_widget.html',
-             'ppapi_ppb_widget.nmf',
              'ppapi_ppb_widget.js'])
 
 node = env.PPAPIBrowserTester('ppapi_ppb_widget_browser_test.out',
                               url='ppapi_ppb_widget.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppb_widget.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons
index 22b2eec..3ae4482 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppp_input_event')
 
 nexe = 'ppapi_ppp_input_event_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppp_input_event${PROGSUFFIX}',
@@ -25,11 +27,11 @@ ppapi_ppp_input_event_nexe = env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             ['ppapi_ppp_input_event.html',
-             'ppapi_ppp_input_event.nmf',
              'ppapi_ppp_input_event.js'])
 
 node = env.PPAPIBrowserTester('ppapi_ppp_input_event_browser_test.out',
                               url='ppapi_ppp_input_event.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppp_input_event.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons
index d95062d..93fc5ad 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'ppp_instance')
 
 nexe = 'ppapi_ppp_instance_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_ppp_instance${PROGSUFFIX}',
@@ -25,11 +27,11 @@ ppapi_ppp_instance_nexe = env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             ['ppapi_ppp_instance.html',
-             'ppapi_ppp_instance.nmf',
              'ppapi_ppp_instance.js'])
 
 node = env.PPAPIBrowserTester('ppapi_ppp_instance_browser_test.out',
                               url='ppapi_ppp_instance.html',
+                              nmfs=['${TEST_DIR}/ppapi_ppp_instance.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons b/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons
index 9d3a973..a16e3bf 100644
--- a/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons
@@ -8,6 +8,8 @@ Import('env')
 # TODO(robertm): those should not be necessary once we go -std=c99
 env.FilterOut(CFLAGS=['-pedantic'])
 env.FilterOut(CCFLAGS=['-pedantic'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
+                     'progress_events')
 
 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'),
 
@@ -24,7 +26,6 @@ env.ComponentProgram(progress_events_target,
 # Needed by other tests using progress events.
 env.Publish(progress_events_target, 'run', [
     'ppapi_progress_events.html',
-    'ppapi_progress_events.nmf',
     ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
      'ppapi_progress_events.js'),
     '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',
@@ -33,6 +34,7 @@ env.Publish(progress_events_target, 'run', [
 node = env.PPAPIBrowserTester(
     'ppapi_progress_events_browser_test.out',
     url='ppapi_progress_events.html',
+    nmfs=['${TEST_DIR}/ppapi_progress_events.nmf'],
     files=env.ExtractPublishedFiles(progress_events_target))
 
 env.AddNodeToTestSuite(node,
diff --git a/ppapi/native_client/tests/ppapi_example_audio/nacl.scons b/ppapi/native_client/tests/ppapi_example_audio/nacl.scons
index cb28a72..8ee755c 100644
--- a/ppapi/native_client/tests/ppapi_example_audio/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_example_audio/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
+                     'ppapi_example_audio/')
 
 nexe_name = 'ppapi_example_audio_%s' % env.get('TARGET_FULLARCH')
 nexe = env.ComponentProgram(nexe_name,
@@ -21,10 +23,11 @@ nexe = env.ComponentProgram(nexe_name,
 
 # Note that the html is required to run this program.
 env.Publish(nexe_name, 'run',
-            ['ppapi_example_audio.html' , 'ppapi_example_audio.nmf'])
+            ['ppapi_example_audio.html'])
 
 test = env.PPAPIBrowserTester('ppapi_example_audio_test.out',
                               url='ppapi_example_audio.html#mute',
+                              nmfs=['${TEST_DIR}/ppapi_example_audio.nmf'],
                               files=[nexe,
                                      env.File('ppapi_example_audio.nmf'),
                                      env.File('ppapi_example_audio.html')])
diff --git a/ppapi/native_client/tests/ppapi_example_font/nacl.scons b/ppapi/native_client/tests/ppapi_example_font/nacl.scons
index 3143ab3d..baeae78 100644
--- a/ppapi/native_client/tests/ppapi_example_font/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_example_font/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
+                     'ppapi_example_font/')
 
 # Adjust compiler flags to the more forgiving standards used in
 # ppapi/examples/*.
@@ -24,10 +26,11 @@ nexe = env.ComponentProgram(nexe_name, [obj],
 
 # Note that the html is required to run this program.
 env.Publish(nexe_name, 'run',
-            ['ppapi_example_font.html', 'ppapi_example_font.nmf'])
+            ['ppapi_example_font.html'])
 
 test = env.PPAPIBrowserTester('ppapi_example_font_test.out',
                               url='ppapi_example_font.html',
+                              nmfs=['${TEST_DIR}/ppapi_example_font.nmf'],
                               files=env.ExtractPublishedFiles(nexe_name))
 
 env.AddNodeToTestSuite(test,
diff --git a/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons b/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons
index ed0cc47..fbe7ede 100644
--- a/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons
@@ -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 @@ nexe = env.ComponentProgram(nexe_name, [obj],
 
 # 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',
+                              nmfs=['${TEST_DIR}/ppapi_example_gles2.nmf'],
                               files=env.ExtractPublishedFiles(nexe_name),
                               args=['--enable_experimental_js'])
 
@@ -34,4 +36,4 @@ env.AddNodeToTestSuite(test,
                        # 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'))
diff --git a/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons b/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons
index bb30dc7..663f46e 100644
--- a/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons
@@ -8,6 +8,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
+                     'ppapi_example_post_message/')
 
 nexe_name = 'ppapi_example_post_message_${TARGET_FULLARCH}'
 obj = env.ComponentObject(
@@ -19,13 +21,13 @@ nexe = env.ComponentProgram(nexe_name, [obj],
 
 # Note that the html is required to run this program.
 env.Publish(nexe_name, 'run',
-            ['ppapi_example_post_message.html',
-             'ppapi_example_post_message.nmf'])
+            ['ppapi_example_post_message.html'])
 
 
 test = env.PPAPIBrowserTester(
     'ppapi_example_post_message_test.out',
     url='ppapi_example_post_message.html',
+    nmfs=['${TEST_DIR}/ppapi_example_post_message.nmf'],
     files=env.ExtractPublishedFiles(nexe_name))
 
 env.AddNodeToTestSuite(test,
diff --git a/ppapi/native_client/tests/ppapi_geturl/nacl.scons b/ppapi/native_client/tests/ppapi_geturl/nacl.scons
index 26078bc..b8d4f7b 100644
--- a/ppapi/native_client/tests/ppapi_geturl/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_geturl/nacl.scons
@@ -17,6 +17,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
+                     'ppapi_geturl/')
 
 nexe = 'ppapi_geturl_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_geturl${PROGSUFFIX}',
@@ -46,11 +48,11 @@ ppapi_geturl_nexe = env.ComponentProgram(nexe,
 
 env.Publish(nexe, 'run',
             ['ppapi_geturl.html',
-             'ppapi_geturl.nmf',
              'ppapi_geturl_success.html'])
 
 node = env.PPAPIBrowserTester('ppapi_geturl_browser_test.out',
                               url='ppapi_geturl.html',
+                              nmfs=['${TEST_DIR}/ppapi_geturl.nmf'],
                               files=env.ExtractPublishedFiles(nexe),
                               args=['--allow_404'],
                               )
@@ -58,5 +60,5 @@ node = env.PPAPIBrowserTester('ppapi_geturl_browser_test.out',
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_ppapi_geturl_browser_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken()
-                       )
+                       is_broken=env.PPAPIBrowserTesterIsBroken() or
+                                 env.Bit('nacl_glibc'))
diff --git a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
index 0205887..7caf477 100644
--- a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
@@ -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'))
@@ -68,13 +70,12 @@ for demo, sources in gles_book_examples.iteritems():
                     '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,
+        nmfs=['${TEST_DIR}/' + nmf_name],
         files=[nexe,
-               env.File(nmf_name),
                env.File('ppapi_gles_book.html')],
         browser_flags=['--enable-accelerated-plugins'])
     env.AddNodeToTestSuite(
diff --git a/ppapi/native_client/tests/ppapi_messaging/nacl.scons b/ppapi/native_client/tests/ppapi_messaging/nacl.scons
index 4483570..d57f20f 100644
--- a/ppapi/native_client/tests/ppapi_messaging/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_messaging/nacl.scons
@@ -13,6 +13,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
+                     'ppapi_messaging/')
 
 nexe = 'ppapi_messaging_%s' % env.get('TARGET_FULLARCH')
 
@@ -31,7 +33,6 @@ ppapi_messaging_nexe = env.ComponentProgram(nexe,
 # Note that the html is required to run this program.
 dest_copy = env.Replicate('$STAGING_DIR',
                           ['ppapi_messaging.html',
-                           'ppapi_messaging.nmf',
                            env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
                                     'browserdata/nacltest.js')]
                           )
@@ -39,6 +40,7 @@ env.Depends(nexe, dest_copy)
 
 node = env.PPAPIBrowserTester('ppapi_messaging_browser_test.out',
                               url='ppapi_messaging.html',
+                              nmfs=['${TEST_DIR}/ppapi_messaging.nmf'],
                               files=[ppapi_messaging_nexe,
                                      env.File('ppapi_messaging.nmf'),
                                      env.File('ppapi_messaging.html')])
diff --git a/ppapi/native_client/tests/ppapi_test_example/nacl.scons b/ppapi/native_client/tests/ppapi_test_example/nacl.scons
index 293d2a1..cc114c0 100644
--- a/ppapi/native_client/tests/ppapi_test_example/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_test_example/nacl.scons
@@ -17,6 +17,8 @@
 Import('env')
 
 env.Prepend(CPPDEFINES=['XP_UNIX'])
+env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
+                     'ppapi_test_example/')
 
 nexe = 'ppapi_test_example_%s' % env.get('TARGET_FULLARCH')
 env.Alias('ppapi_test_example${PROGSUFFIX}',
@@ -34,11 +36,11 @@ ppapi_test_example_nexe = env.ComponentProgram(
 
 env.Publish(nexe, 'run',
             ['ppapi_test_example.html',
-             'ppapi_test_example.nmf',
              'ppapi_test_example.js'])
 
 node = env.PPAPIBrowserTester('ppapi_test_example_browser_test.out',
                               url='ppapi_test_example.html',
+                              nmfs=['${TEST_DIR}/ppapi_test_example.nmf'],
                               files=env.ExtractPublishedFiles(nexe))
 
 env.AddNodeToTestSuite(node,