Revert "Run setup_test_links in both deps"
This reverts commit 0f9fad45831ee5a7dfcf2b1fef9f9bb4cf6f3465
I guess it caused the tree broken. There is a VMTest failure that can't find the pyauto_dep package file. Only this CL changed the pyauto_dep thing recently.
http://build.chromium.org/p/chromiumos/builders/amd64%20generic%20full/builds/3380
I can't ping the authors. So revert this CL first.
Change-Id: I3ace2951e3129e39ef76b534e1b68598a3c075d3
Reviewed-on: https://gerrit.chromium.org/gerrit/26651
Reviewed-by: Joseph Shyh-In Hwang <josephsih@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/mod_test_image_for_pyauto.sh b/mod_test_image_for_pyauto.sh
index 6afc26a..c7e5d18 100644
--- a/mod_test_image_for_pyauto.sh
+++ b/mod_test_image_for_pyauto.sh
@@ -162,9 +162,6 @@
sudo chown root:root suid-python
sudo chmod 4755 suid-python
popd
- info "Setting up pyauto required symbolic links in $item..."
- sudo chroot "${ROOT_FS_DIR}" sudo bash "/usr/local/autotest/deps/\
-$item/test_src/out/Release/setup_test_links.sh"
done
# Add an easy link to get to the functional folder
@@ -172,6 +169,11 @@
"/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)
