Buildbot enhancements: Builder/Tester split

build/android/buildbot_functions.sh

Index: build/android/buildbot_functions.sh
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index 4c26610d897bff73aa67db603a59263dbb1db5b6..4f51660abc6a1b4dfefa9d785d27d12bc5d281a8 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -26,7 +26,7 @@ function bb_setup_environment {
 # $1: source root.
 function bb_install_build_deps {
   echo "@@@BUILD_STEP install build deps android@@@"
-  local script="$1/build/install-build-deps-android-sdk.sh"
+  local script="${1-$SRC_ROOT}/build/install-build-deps-android-sdk.sh"

[John Grabowski, 2012/06/18 18:20:04]

Args to this function say you must pass in a SRC_ROOT, not "if you want or we'll
figure it out".

Trying hard to not reference globals, especially since the test mode for this
script is "in your current shell environment".


Do you feel strongly?

[Isaac (away), 2012/06/18 18:59:46]

Was trying to keep backwards compatibility for scripts that didn't create
SRC_ROOT.  I can put back to before if you'd prefer.

The other issue I realized was that by defining SRC_ROOT in my fyi_tester.sh
script, I could affect the individual test functions.

   if [[ -f "$script" ]]; then
     "$script"
   else
@@ -44,7 +44,7 @@ function bb_force_bot_green_and_exit {
 # $1: source root.
 function bb_baseline_setup {
   echo "@@@BUILD_STEP cd into source root@@@"
-  SRC_ROOT="$1"
+  export SRC_ROOT=${1-$SRC_ROOT}

[John Grabowski, 2012/06/18 18:20:04]

ditto

   if [ ! -d "${SRC_ROOT}" ] ; then
     echo "Please specify a valid source root directory as an arg"
     echo '@@@STEP_FAILURE@@@'
@@ -237,3 +237,19 @@ function bb_run_apk_tests {
   echo "@@@BUILD_STEP Run APK Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose --apk=True
 }
+
+# Zip and archive a build
+function bb_zip_build {
+  echo "@@@BUILD_STEP Zip build@@@"
+  python ../../../../scripts/slave/zip_build.py
+}
+
+# Download and extract a build
+function bb_extract_build {
+  echo "@@@BUILD_STEP Download and extract build@@@"
+  python ../../../../scripts/slave/extract_build.py \
+    --no-append-dir \
+    --build-dir out \
+    --target Release \
+    --build-url "$BUILDBOT_BUILD_URL"
+}