From b57ce686acf292ad71ab4979cd19d5b348077c1b Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Tue, 14 Sep 2010 13:40:09 -0700
Subject: [PATCH] Swap out the order of detecting build failure and grepping
for teamcity test result errors
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 878aa45ce37..b2b0433d05e 100755
--- a/build.sh
+++ b/build.sh
@@ -251,13 +251,13 @@ then
begin_section "Build$variant"
build_dir=`build_dir_$arch $variant`
build_dir_stubs="$build_dir/win_setup/$variant"
- tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity"
if `cat "$build_dir/build_ok"`
then
echo so far so good.
else
record_failure "Parallel build of \"$variant\" failed."
fi
+ tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity"
end_section "Build$variant"
done
end_section WaitParallel
--
GitLab