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

Unified Diff: tests/upstream.sh

Issue 7828024: Do not run integration tests on upload, they are too slow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: git branch has no -q flag Created 9 years, 4 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 | « tests/gclient_scm_test.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/upstream.sh
diff --git a/tests/upstream.sh b/tests/upstream.sh
index 0327b68227814375a726e384a5509ee3ee1ec26c..b2f8c930221f8322d4ef0355d354936d0fe12db0 100755
--- a/tests/upstream.sh
+++ b/tests/upstream.sh
@@ -16,7 +16,8 @@ setup_gitsvn
git config rietveld.server localhost:8080
for ref in refs/remotes/trunk refs/remotes/some_branch; do
- git checkout -q -B feature_branch $ref
+ git branch -f --set-upstream feature_branch $ref
+ git checkout -q feature_branch
test_expect_success "Guessing upstream branch for $ref" \
"$GIT_CL upstream | egrep -q '^$ref$'"
git checkout -q master
« no previous file with comments | « tests/gclient_scm_test.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698