diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2015-09-18 16:01:21 -0700 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2015-09-18 16:01:21 -0700 |
commit | c96b9eb7503ba6ac12f50bc5ae69395510040362 (patch) | |
tree | 1e20cfee6d68ec1dd152d94e56145f291c4960ce | |
parent | c95eead416aa1cad9f7b08c87975a3ca9a597421 (diff) |
correct behavior for travis flag
-rwxr-xr-x | tools/run_tests/run_tests.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 4774a31705..1491b1c41c 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -462,13 +462,14 @@ argp.add_argument('-x', '--xml_report', default=None, type=str, help='Generates a JUnit-compatible XML report') args = argp.parse_args() -if args.use_docker and not args.travis: - print 'Seen --use_docker flag, will run tests under docker.' - print - print 'IMPORTANT: The changes you are testing need to be locally committed' - print 'because only the committed changes in the current branch will be' - print 'copied to the docker environment.' - time.sleep(5) +if args.use_docker: + if not args.travis: + print 'Seen --use_docker flag, will run tests under docker.' + print + print 'IMPORTANT: The changes you are testing need to be locally committed' + print 'because only the committed changes in the current branch will be' + print 'copied to the docker environment.' + time.sleep(5) child_argv = [ arg for arg in sys.argv if not arg == '--use_docker' ] run_tests_cmd = 'tools/run_tests/run_tests.py %s' % " ".join(child_argv[1:]) |