From f47611a7711da8cfba99a9d328bfe0dcb58b450b Mon Sep 17 00:00:00 2001 From: Kris Rambish Date: Thu, 31 May 2012 16:28:57 -0700 Subject: [PATCH] Fix for new (or lack of) locations of pyauto deps. BUG=chromium-os:31306 TEST=Ran it! Change-Id: I7a71fcba8504b84c055ba076d8bbceefc0ab45c8 Reviewed-on: https://gerrit.chromium.org/gerrit/24251 Reviewed-by: Nirnimesh Reviewed-by: Kris Rambish Tested-by: Kris Rambish Commit-Ready: Kris Rambish --- mod_test_image_for_pyauto.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mod_test_image_for_pyauto.sh b/mod_test_image_for_pyauto.sh index 446a65418a..c7e5d18dad 100644 --- a/mod_test_image_for_pyauto.sh +++ b/mod_test_image_for_pyauto.sh @@ -92,14 +92,9 @@ for item in base chrome content net pdf third_party; do sudo cp -f -r "${CHROME_DEP}/test_src/$item" "${IMAGE_TEST_SRC_DIR}" done -info "Copying release binaries..." -binaries=( chromedriver pyautolib.py _pyautolib.so pyproto setup_test_links.sh \ - test_data ) -for item in "${binaries[@]}"; do - info "Copying $item to ${IMAGE_RELEASE_DIR}" - sudo cp -f -r "${CHROME_DEP}/test_src/out/Release/$item" \ +info "Copying chrome dep components..." +sudo cp -f -r "${CHROME_DEP}/test_src/out/Release/setup_test_links.sh" \ "${IMAGE_RELEASE_DIR}/" -done info "Copying pyauto dependencies..." sudo cp -r $PYAUTO_DEP "${STATEFUL_FS_AUTOTEST_DIR}/deps" @@ -166,7 +161,6 @@ for item in chrome_test pyauto_dep; do sudo cp "${ROOT_FS_DIR}/usr/local/bin/python2.6" suid-python sudo chown root:root suid-python sudo chmod 4755 suid-python - sudo sh setup_test_links.sh popd done @@ -175,6 +169,11 @@ done "/usr/local/autotest/deps/chrome_test/test_src/chrome/test/functional" \ "${ROOT_FS_DIR}/pyauto" +info "Setting up pyauto required symbolic links..." +SETUP_LINKS="/usr/local/autotest/deps/chrome_test/test_src/out/\ +Release/setup_test_links.sh" +sudo chroot "${ROOT_FS_DIR}" sudo bash "${SETUP_LINKS}" + cleanup # cros_make_image_bootable is unstable (crosbug.com/18709)