Repository: sentry Updated Branches: refs/heads/master a3a20a195 -> 782d132ce
Revert "SENTRY-2056: Display test-patch.py output on the standard console to see progress on Jenkins (Sergio Pena, reviewed by kalyan kumar kalvagadda)" This reverts commit a3a20a195cc54c3b414cd0b5734d854332096db2. Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/782d132c Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/782d132c Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/782d132c Branch: refs/heads/master Commit: 782d132ce4f45ac05d1c26d2f77030ddd5f1d997 Parents: a3a20a1 Author: Sergio Pena <[email protected]> Authored: Wed Nov 22 15:22:03 2017 -0600 Committer: Sergio Pena <[email protected]> Committed: Wed Nov 22 15:22:03 2017 -0600 ---------------------------------------------------------------------- dev-support/test-patch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/782d132c/dev-support/test-patch.py ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.py b/dev-support/test-patch.py index e01032f..e44be3a 100644 --- a/dev-support/test-patch.py +++ b/dev-support/test-patch.py @@ -120,7 +120,7 @@ def git_checkout(result, branch): def git_apply(result, cmd, patch_file, output_dir): output_file = "%s/apply.txt" % (output_dir) - rc = execute("%s %s |& tee %s" % (cmd, patch_file, output_file)) + rc = execute("%s %s 1>%s 2>&1" % (cmd, patch_file, output_file)) output = "" if os.path.exists(output_file): with open(output_file) as fh: @@ -131,12 +131,12 @@ def git_apply(result, cmd, patch_file, output_dir): result.fatal("failed to apply patch (exit code %d):\n%s\n" % (rc, output)) def mvn_clean(result, mvn_repo, output_dir, mvn_profile): - rc = execute("mvn clean -Dmaven.repo.local=%s %s |& tee %s/clean.txt" % (mvn_repo, mvn_profile, output_dir)) + rc = execute("mvn clean -Dmaven.repo.local=%s %s 1>%s/clean.txt 2>&1" % (mvn_repo, mvn_profile, output_dir)) if rc != 0: result.fatal("failed to clean project (exit code %d)" % (rc)) def mvn_install(result, mvn_repo, output_dir, mvn_profile): - rc = execute("mvn install -U -DskipTests -Dmaven.repo.local=%s %s |& tee %s/install.txt" % (mvn_repo, mvn_profile, output_dir)) + rc = execute("mvn install -U -DskipTests -Dmaven.repo.local=%s %s 1>%s/install.txt 2>&1" % (mvn_repo, mvn_profile, output_dir)) if rc != 0: result.fatal("failed to build with patch (exit code %d)" % (rc)) @@ -146,7 +146,7 @@ def find_all_files(top): yield os.path.join(root, f) def mvn_test(result, mvn_repo, output_dir, mvn_profile): - rc = execute("mvn verify -Dmaven.repo.local=%s %s |& tee %s/test.txt" % (mvn_repo, mvn_profile, output_dir)) + rc = execute("mvn verify -Dmaven.repo.local=%s %s 1>%s/test.txt 2>&1" % (mvn_repo, mvn_profile, output_dir)) if rc == 0: result.success("all tests passed") else:
