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: 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(-)
(limited to 'build.sh')
diff --git a/build.sh b/build.sh
index 878aa45ce3..b2b0433d05 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
--
cgit v1.2.3
From cbed6ecd2be9849aae900ef17070d7bd2aa9542c Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Wed, 15 Sep 2010 11:36:11 -0700
Subject: Place test service messages into their own block.
---
build.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'build.sh')
diff --git a/build.sh b/build.sh
index b2b0433d05..39bd7aa53f 100755
--- a/build.sh
+++ b/build.sh
@@ -222,7 +222,10 @@ do
fi
else
begin_section "Build$variant"
- build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity"
+ build "$variant" "$build_dir" > "$build_log" 2>&1
+ begin_section Tests
+ grep --line-buffered "^##teamcity" "$build_log"
+ end_section Tests
if `cat "$build_dir/build_ok"`
then
echo so far so good.
@@ -257,7 +260,9 @@ then
else
record_failure "Parallel build of \"$variant\" failed."
fi
+ begin_section Tests
tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity"
+ end_section Tests
end_section "Build$variant"
done
end_section WaitParallel
--
cgit v1.2.3
From 938e8cdb43430aff2ae7479b5f57fc3aef686095 Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Wed, 15 Sep 2010 16:37:08 -0700
Subject: Use CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
---
build.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'build.sh')
diff --git a/build.sh b/build.sh
index 39bd7aa53f..88faf12473 100755
--- a/build.sh
+++ b/build.sh
@@ -63,7 +63,8 @@ pre_build()
-DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
-DINSTALL_PROPRIETARY:BOOL=ON \
-DLOCALIZESETUP:BOOL=ON \
- -DPACKAGE:BOOL=ON
+ -DPACKAGE:BOOL=ON \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
end_section "Pre$variant"
}
--
cgit v1.2.3
From 78e52f40424cb8336ab5d06c9ea37e16cb2b40a7 Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Thu, 23 Sep 2010 12:55:20 -0700
Subject: Add support for platform specific permanent quick links to the
installer
---
build.sh | 1 +
1 file changed, 1 insertion(+)
(limited to 'build.sh')
diff --git a/build.sh b/build.sh
index 88faf12473..25ff0f368d 100755
--- a/build.sh
+++ b/build.sh
@@ -284,6 +284,7 @@ then
succeeded=$build_coverity
else
upload_item installer "$package" binary/octet-stream
+ upload_item quicklink "$package" binary/octet-stream
# Upload crash reporter files.
case "$last_built_variant" in
--
cgit v1.2.3