merge.

1 files changed, 9 insertions, 3 deletions

diff --git a/build.sh b/build.sh
index 878aa45ce3..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"
 }
 
@@ -222,7 +223,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.
@@ -251,13 +255,15 @@ 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
+    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