diff options
| author | msw <msw@chromium.org> | 2015-06-18 17:42:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 00:43:17 +0000 |
| commit | c93d5541891b61b89307e3df1de84470b7be503a (patch) | |
| tree | a71fcf44547ae329e94b955e149c646ab1896f9f /testing/scripts | |
| parent | 5c2d502d34ea0f162d7fc5c916b1cff9e6acb0b4 (diff) | |
| download | chromium_src-c93d5541891b61b89307e3df1de84470b7be503a.zip chromium_src-c93d5541891b61b89307e3df1de84470b7be503a.tar.gz chromium_src-c93d5541891b61b89307e3df1de84470b7be503a.tar.bz2 | |
Make apptest arg optional; avoid xvfb for --gtest_list_tests
Make the apptest_runner test list file arg optional.
Cleanup some argument help info, etc.
Do not use xvfb for --gtest_list_tests (breaks parsing).
Update the mojo_apptest.py testing script incovation.
BUG=NONE
TEST=Simpler apptest_runner.py invocation, no unintended test invocations from xvfb output.
R=sky@chromium.org
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1175133005
Cr-Commit-Position: refs/heads/master@{#335179}
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/mojo_apptest.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/testing/scripts/mojo_apptest.py b/testing/scripts/mojo_apptest.py index 09e3f23..49b855da2 100755 --- a/testing/scripts/mojo_apptest.py +++ b/testing/scripts/mojo_apptest.py @@ -13,11 +13,10 @@ import common def main_run(args): runner = os.path.join(common.SRC_DIR, 'mojo', 'tools', 'apptest_runner.py') - tests = os.path.join(common.SRC_DIR, 'mojo', 'tools', 'data', 'apptests') build_dir = os.path.join(common.SRC_DIR, 'out', args.build_config_fs) with common.temporary_file() as tempfile_path: - rc = common.run_command([runner, tests, build_dir, '--verbose', + rc = common.run_command([runner, build_dir, '--verbose', '--write-full-results-to', tempfile_path]) with open(tempfile_path) as f: results = json.load(f) |