summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsonnyrao@chromium.org <sonnyrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 01:41:57 +0000
committersonnyrao@chromium.org <sonnyrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 01:41:57 +0000
commita85276174e368b8c69011d8b29f85254a2067e3f (patch)
tree618e28b7b03f58dbf1ea17cb62ff8f4201b34809
parente80c92698a601d2e737a2c5cf5e128b291fc46d5 (diff)
downloadchromium_src-a85276174e368b8c69011d8b29f85254a2067e3f.zip
chromium_src-a85276174e368b8c69011d8b29f85254a2067e3f.tar.gz
chromium_src-a85276174e368b8c69011d8b29f85254a2067e3f.tar.bz2
Fix page_cycler_dep setup_test_links.sh to be more robust
In various cases, including the one where the page_cycler data isn't present, the setup_test_links.sh fails because there's a dangling symlink which is not pointing to a directory. This fixes it by changing the test to just look for the existence of that file, regardless of it's ulimate type. BUG=chromium-os:31310 TEST=run desktopui_PyAutoPerfTests built from a external manifest twice R=nirnimesh@chromium.org Review URL: https://chromiumcodereview.appspot.com/10465002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140154 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xchrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/setup_test_links.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/setup_test_links.sh
index cfbc8a5..109556c 100755
--- a/chrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/setup_test_links.sh
+++ b/chrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/setup_test_links.sh
@@ -12,7 +12,7 @@ if [ ! -d /usr/local/autotest/deps/chrome_test ] ; then
return 1
fi
-if [ ! -d /usr/local/autotest/deps/chrome_test/test_src/data ]; then
- ln -s /usr/local/autotest/deps/page_cycler_dep/test_src/data \
+if [ ! -e /usr/local/autotest/deps/chrome_test/test_src/data ]; then
+ ln -sf /usr/local/autotest/deps/page_cycler_dep/test_src/data \
/usr/local/autotest/deps/chrome_test/test_src/data
fi