Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: src/scripts/run_remote_tests.sh

Issue 578027: Make run_remote_tests also update the chroot autotest (Closed)
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/scripts/build_autotest.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/run_remote_tests.sh
diff --git a/src/scripts/run_remote_tests.sh b/src/scripts/run_remote_tests.sh
index b6502d09b403d2178fe2480810457ec7c4cca664..4801b8a556e9d77823d5ae1aec4e5b37436b8f22 100755
--- a/src/scripts/run_remote_tests.sh
+++ b/src/scripts/run_remote_tests.sh
@@ -10,6 +10,7 @@
# The path to common.sh should be relative to your script's location.
. "$(dirname $0)/common.sh"
+. "$(dirname $0)/autotest_lib.sh"
. "$(dirname $0)/remote_access.sh"
DEFAULT_OUTPUT_FILE=test-output-$(date '+%Y%m%d.%H%M%S')
@@ -103,7 +104,7 @@ function main() {
set -e
- AUTOTEST_DIR="${DEFAULT_CHROOT_DIR}/usr/local/autotest"
+ local autotest_dir="${DEFAULT_CHROOT_DIR}/usr/local/autotest"
# Set global TMP for remote_access.sh's sake
TMP=$(mktemp -d /tmp/run_remote_tests.XXXX)
@@ -112,17 +113,18 @@ function main() {
trap cleanup EXIT
- # Check for installed autotest.
- local autoserv="${AUTOTEST_DIR}/server/autoserv"
- if [[ ! -f "${autoserv}" ]]; then
- echo "Cannot find autotest in build dir. Run build_autotest.sh"
- exit 1
- fi
+ # Always copy into installed autotest directory. This way if a user
+ # is just modifying scripts, they take effect without having to wait
+ # for the laborious build_autotest.sh command.
+ local original="${GCLIENT_ROOT}/src/third_party/autotest/files"
+ update_chroot_autotest "${original}"
+
+ local autoserv="${autotest_dir}/server/autoserv"
local control_files_to_run=""
# Now search for tests which unambiguously include the given identifier
- local search_path=$(echo ${AUTOTEST_DIR}/{client,server}/{tests,site_tests})
+ local search_path=$(echo ${autotest_dir}/{client,server}/{tests,site_tests})
for test_request in $FLAGS_ARGV; do
test_request=$(remove_quotes "${test_request}")
! finds=$(find ${search_path} -type f -name control | \
« no previous file with comments | « src/scripts/build_autotest.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698