summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Goetze (CG) <cg@lindenlab.com>2010-10-28 12:46:16 -0700
committerChristian Goetze (CG) <cg@lindenlab.com>2010-10-28 12:46:16 -0700
commit9c1d9665f7aee1faad6eaf4d23407688cc7ba3b7 (patch)
tree13249cbb6f3f98b3193f26985b36ee5e55779bed
parenta91bff4036bbdd0f32722ed573f9f44ab00f00f0 (diff)
Append logs of multivariant builds correctly.
-rw-r--r--build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index b118474498..c180fe12c4 100644
--- a/build.sh
+++ b/build.sh
@@ -59,7 +59,7 @@ pre_build()
-t $variant \
-G "$cmake_generator" \
configure \
- -DGRID:STRING="$viewer_grid" \
+ -DGRID:STRING="$viewer_grid" \
-DVIEWER_CHANNEL:STRING="$viewer_channel" \
-DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
-DINSTALL_PROPRIETARY:BOOL=ON \
@@ -228,7 +228,7 @@ do
fi
else
begin_section "Build$variant"
- build "$variant" "$build_dir" > "$build_log" 2>&1
+ build "$variant" "$build_dir" >> "$build_log" 2>&1
begin_section Tests
grep --line-buffered "^##teamcity" "$build_log"
end_section Tests