diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 02:26:45 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 02:26:45 +0000 |
| commit | 51b20ea7585ddc7c81a6ba2056cdde996b749fba (patch) | |
| tree | 04cdf34544306ec0379a07060f3b76344c5dec65 /chrome | |
| parent | 31036040888bf17e2d0c5a4bc9c977b501cfb93a (diff) | |
| download | chromium_src-51b20ea7585ddc7c81a6ba2056cdde996b749fba.zip chromium_src-51b20ea7585ddc7c81a6ba2056cdde996b749fba.tar.gz chromium_src-51b20ea7585ddc7c81a6ba2056cdde996b749fba.tar.bz2 | |
Revert 176224
NACL Tests bot keeps failing.
> NaCl: Move all browser tests into nacl_irt_test_env
>
> IRT-using nexes are normally built in nacl_irt_test_env, not nacl_env.
> All of chrome_browser_tests uses the IRT, so changing these tests to
> use nacl_irt_test_env brings chrome_browser_tests into line with the
> rest of the NaCl Scons build.
>
> This will let us fix libimc_syscalls to call GC hooks without breaking
> linking the nexes in chrome_browser_tests (since some tests there use
> libimc_syscalls).
>
> BUG=https://code.google.com/p/nativeclient/issues/detail?id=3253
> TEST=nacl_integration + count tests to check we haven't lost any
>
> Review URL: https://codereview.chromium.org/11613012
TBR=mseaborn@chromium.org
Review URL: https://codereview.chromium.org/11852003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x | chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py | 6 |
1 files changed, 4 insertions, 2 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 d59a40f..b21e2bc 100755 --- a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py +++ b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py @@ -217,14 +217,16 @@ def BuildAndTest(options): # Run nacl/chrome integration tests. # Note that we have to add nacl_irt_test to --mode in order to get - # the "_irt" variant of "chrome_browser_tests" to run. + # inbrowser_test_runner to run. + # TODO(mseaborn): Change it so that inbrowser_test_runner is not a + # special case. 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_irt') + cmd.append('chrome_browser_tests') # Download the toolchain(s). if options.enable_pnacl: |