Remove testing utilities and fix symlinks.

common.sh

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
@@ skipping 287 matching lines @@
   dpkg-buildpackage -b -tc -us -uc -j$NUM_JOBS
   mv ../${PKG_BASE}_*.deb "$out_dir"
   rm ../${PKG_BASE}_*.changes
   popd
 }
 
 # Enter a chroot and restart the current script if needed
 function restart_in_chroot_if_needed {
   # NB:  Pass in ARGV:  restart_in_chroot_if_needed "$@"
   if [ $INSIDE_CHROOT -ne 1 ]; then
-    local abspath=$(readlink -f "$0")
-    # strip everything up to (and including) /scripts/ from abspath
-    local path_from_scripts="${abspath##*/scripts/}"
+    # Get inside_chroot path for script.
+    local chroot_path="$(reinterpret_path_for_chroot "$0")"
     exec $SCRIPTS_DIR/enter_chroot.sh -- \
-      "$CHROOT_TRUNK_DIR/src/scripts/$path_from_scripts" "$@"
+      "$chroot_path" "$@"

[petkov, 2011/03/24 03:35:17]

move this up?

   fi
 }
 
 # Fail unless we're inside the chroot.  This guards against messing up your
 # workstation.
 function assert_inside_chroot {
   if [ $INSIDE_CHROOT -ne 1 ]; then
     echo "This script must be run inside the chroot.  Run this first:"
     echo "    $SCRIPTS_DIR/enter_chroot.sh"
     exit 1
@@ skipping 366 matching lines @@
 check_for_tool() {
   local tool=$1
   local ebuild=$2
 
   if ! which "${tool}" >/dev/null ; then
     error "The ${tool} utility was not found in your path.  Run the following"
     error "command in your chroot to install it: sudo -E emerge ${ebuild}"
     exit 1
   fi
 }
+
+# Reinterprets path from outside the chroot for use inside.
+# Returns "" if "" given.
+# $1 - The path to reinterpret.
+function reinterpret_path_for_chroot() {
+  if [ $INSIDE_CHROOT -ne 1 ]; then
+    if [ -z "${1}" ]; then
+      echo ""
+    else
+      local path_abs_path=$(readlink -f "${1}")
+      local gclient_root_abs_path=$(readlink -f "${GCLIENT_ROOT}")
+
+      # Strip the repository root from the path.
+      local relative_path=$(echo ${path_abs_path} \
+          | sed s:${gclient_root_abs_path}/::)

[petkov, 2011/03/24 03:35:17]

move | up

+
+      if [ "${relative_path}" = "${path_abs_path}" ]; then
+        die "Error reinterpreting path.  Path ${1} is not within source tree."
+      fi
+
+      # Prepend the chroot repository path.
+      echo "/home/${USER}/trunk/${relative_path}"
+    fi
+  else
+    # Path is already inside the chroot :).
+    echo "${1}"
+  fi
+}