diff options
3 files changed, 11 insertions, 16 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py index b21e2bc..d59a40f 100755 --- a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py +++ b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py @@ -217,16 +217,14 @@ def BuildAndTest(options): # Run nacl/chrome integration tests. # Note that we have to add nacl_irt_test to --mode in order to get - # inbrowser_test_runner to run. - # TODO(mseaborn): Change it so that inbrowser_test_runner is not a - # special case. + # the "_irt" variant of "chrome_browser_tests" to run. cmd = scons + ['--verbose', '-k', 'platform=x86-%d' % bits, '--mode=opt-host,nacl,nacl_irt_test', 'chrome_browser_path=%s' % chrome_filename, ] if not options.integration_bot and not options.morenacl_bot: cmd.append('disable_flaky_tests=1') - cmd.append('chrome_browser_tests') + cmd.append('chrome_browser_tests_irt') # Download the toolchain(s). if options.enable_pnacl: diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons index 967bbc9..34ceff2 100644 --- a/ppapi/native_client/chrome_main.scons +++ b/ppapi/native_client/chrome_main.scons @@ -33,12 +33,20 @@ def ExtendFileList(existing, additional): ppapi_scons_files = {} ppapi_scons_files['trusted_scons_files'] = [] ppapi_scons_files['untrusted_irt_scons_files'] = [] +ppapi_scons_files['nonvariant_test_scons_files'] = [] -ppapi_scons_files['nonvariant_test_scons_files'] = [ +ppapi_scons_files['irt_variant_test_scons_files'] = [ 'tests/breakpad_crash_test/nacl.scons', 'tests/nacl_browser/browser_dynamic_library/nacl.scons', + # 'inbrowser_test_runner' must be in the irt_variant list + # otherwise it will run no tests. + 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', + # Disabled by Brad Chen 4 Sep to try to green Chromium + # nacl_integration tests + #'tests/nacl_browser/fault_injection/nacl.scons', 'tests/nacl_browser/manifest_file/nacl.scons', 'tests/nacl_browser/nameservice/nacl.scons', + 'tests/nacl_browser/pnacl_client_translator/nacl.scons', 'tests/nacl_browser/postmessage_redir/nacl.scons', 'tests/ppapi_browser/bad/nacl.scons', 'tests/ppapi_browser/crash/nacl.scons', @@ -49,16 +57,6 @@ ppapi_scons_files['nonvariant_test_scons_files'] = [ 'tests/ppapi_test_lib/nacl.scons', ] -ppapi_scons_files['irt_variant_test_scons_files'] = [ - # 'inbrowser_test_runner' must be in the irt_variant list - # otherwise it will run no tests. - 'tests/nacl_browser/inbrowser_test_runner/nacl.scons', - # Disabled by Brad Chen 4 Sep to try to green Chromium - # nacl_integration tests - #'tests/nacl_browser/fault_injection/nacl.scons', - 'tests/nacl_browser/pnacl_client_translator/nacl.scons', -] - ppapi_scons_files['untrusted_scons_files'] = [ 'src/shared/ppapi/nacl.scons', 'src/untrusted/irt_stub/nacl.scons', diff --git a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons index 33ed844..4dd2d7a 100644 --- a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons +++ b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons @@ -48,7 +48,6 @@ def AddTest(env, test_name, exe_list, parallel=False): # Disabled on Valgrind because of multiple nexes. # TODO(eugenis): enable when Valgrind learns to autodetect the nexe name env.AddNodeToTestSuite(node, ['chrome_browser_tests'], test_name, - disable_irt_suffix=True, is_broken=env.PPAPIBrowserTesterIsBroken() or env.Bit('running_on_valgrind') or # inbrowser_test_runner_parallel is flaky on 32 bit windows |