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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/submodule-merge-test.sh

Issue 795723003: Fix test failures on Ubuntu/Trusty. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years 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 | « tests/scm_unittest.py ('k') | tests/test-lib.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/submodule-merge-test.sh
diff --git a/tests/submodule-merge-test.sh b/tests/submodule-merge-test.sh
index 8818a2a5c11e997ccf816ca95e7d03353eeb533a..2dc49ea233bf1017240a05a9073a0e816474cc2b 100755
--- a/tests/submodule-merge-test.sh
+++ b/tests/submodule-merge-test.sh
@@ -5,6 +5,8 @@
# found in the LICENSE file.
set -e
+SCRIPT_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
+cd ${SCRIPT_DIR}
. ./test-lib.sh
@@ -43,7 +45,7 @@ TBR=foo"
cd git-svn-submodule
git svn fetch
- last_svn_rev=`git show refs/remotes/trunk | grep git-svn-id: | \
+ last_svn_rev=`git show refs/remotes/origin/trunk | grep git-svn-id: | \
grep -o trunk@[0-9]* | xargs`
test_expect_success "git svn fetch gets new svn revision" \
« no previous file with comments | « tests/scm_unittest.py ('k') | tests/test-lib.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698