diff options
author | Calin Juravle <calin@google.com> | 2015-01-27 16:14:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-27 16:14:48 +0000 |
commit | 8c776cd9186e68c23b0983415ae14798e5ea5ab3 (patch) | |
tree | 66c5aa8f8da1f0ff0eea7a2f5ac80cf39711eb00 | |
parent | eb6e852e1ed2b1c13e7b92a38a842dd42d60e82a (diff) | |
parent | 3cf4877c66f84a7ba524732e66adcfa5296e07c1 (diff) | |
download | art-8c776cd9186e68c23b0983415ae14798e5ea5ab3.zip art-8c776cd9186e68c23b0983415ae14798e5ea5ab3.tar.gz art-8c776cd9186e68c23b0983415ae14798e5ea5ab3.tar.bz2 |
Merge "run-test: enable checker in dev mode"
-rwxr-xr-x | test/run-test | 14 | ||||
-rwxr-xr-x | tools/checker.py | 5 |
2 files changed, 15 insertions, 4 deletions
diff --git a/test/run-test b/test/run-test index 8ef3e3e..8c47663 100755 --- a/test/run-test +++ b/test/run-test @@ -543,10 +543,20 @@ if [ "$dev_mode" = "yes" ]; then echo "${test_dir}: running..." 1>&2 "./${run}" $run_args "$@" 2>&1 run_exit="$?" - echo "run exit status: $run_exit" 1>&2 + if [ "$run_exit" = "0" ]; then - good="yes" + if [ "$run_checker" = "yes" ]; then + "$checker" "$cfg_output" "$tmp_dir" 2>&1 + checker_exit="$?" + if [ "$checker_exit" = "0" ]; then + good="yes" + fi + echo "checker exit status: $checker_exit" 1>&2 + else + good="yes" + fi fi + echo "run exit status: $run_exit" 1>&2 fi elif [ "$update_mode" = "yes" ]; then "./${build}" $build_args >"$build_output" 2>&1 diff --git a/tools/checker.py b/tools/checker.py index 55f015e..5744c15 100755 --- a/tools/checker.py +++ b/tools/checker.py @@ -110,9 +110,10 @@ class Logger(object): text = Logger.Color.terminalCode(color, out) + text + \ Logger.Color.terminalCode(Logger.Color.Default, out) if newLine: - print(text, flush=True, file=out) + print(text, file=out) else: - print(text, end="", flush=True, file=out) + print(text, end="", file=out) + out.flush() @staticmethod def fail(msg, file=None, line=-1): |