summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild.sh14
-rw-r--r--indra/llmessage/tests/testrunner.py2
2 files changed, 11 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index 7c11308f0c..8ca3208087 100755
--- a/build.sh
+++ b/build.sh
@@ -173,9 +173,6 @@ eval "$("$AUTOBUILD" source_environment)"
env|sort
-# Install packages.
-"$AUTOBUILD" install --skip-license-check
-
# Now run the build
succeeded=true
build_processes=
@@ -191,10 +188,19 @@ do
begin_section "Do$variant"
build_dir=`build_dir_$arch $variant`
build_dir_stubs="$build_dir/win_setup/$variant"
+
+ begin_section "PreClean"
rm -rf "$build_dir"
+ end_section "PreClean"
+
mkdir -p "$build_dir"
mkdir -p "$build_dir/tmp"
- #export TMP="$build_dir/tmp"
+
+ # Install packages.
+ begin_section "AutobuildInstall"
+ "$AUTOBUILD" install --verbose --skip-license-check
+ end_section "AutobuildInstall"
+
if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
then
if $build_link_parallel
diff --git a/indra/llmessage/tests/testrunner.py b/indra/llmessage/tests/testrunner.py
index f2c841532a..5b9beb359b 100644
--- a/indra/llmessage/tests/testrunner.py
+++ b/indra/llmessage/tests/testrunner.py
@@ -35,7 +35,7 @@ import re
import errno
import socket
-VERBOSE = os.environ.get("INTEGRATION_TEST_VERBOSE", "1") # default to verbose
+VERBOSE = os.environ.get("INTEGRATION_TEST_VERBOSE", "0") # default to quiet
# Support usage such as INTEGRATION_TEST_VERBOSE=off -- distressing to user if
# that construct actually turns on verbosity...
VERBOSE = not re.match(r"(0|off|false|quiet)$", VERBOSE, re.IGNORECASE)