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

Side by Side Diff: tools/release/test_scripts.py

Issue 925313002: Fix branch name in merge script. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « tools/release/common_includes.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2013 the V8 project authors. All rights reserved. 2 # Copyright 2013 the V8 project authors. All rights reserved.
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following 10 # copyright notice, this list of conditions and the following
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1184 self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version)) 1184 self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version))
1185 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version)) 1185 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version))
1186 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version)) 1186 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version))
1187 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version)) 1187 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version))
1188 1188
1189 self.Expect([ 1189 self.Expect([
1190 Cmd("git status -s -uno", ""), 1190 Cmd("git status -s -uno", ""),
1191 Cmd("git status -s -b -uno", "## some_branch\n"), 1191 Cmd("git status -s -b -uno", "## some_branch\n"),
1192 Cmd("git fetch", ""), 1192 Cmd("git fetch", ""),
1193 Cmd("git branch", " branch1\n* branch2\n"), 1193 Cmd("git branch", " branch1\n* branch2\n"),
1194 Cmd("git new-branch %s --upstream origin/candidates" % 1194 Cmd("git new-branch %s --upstream refs/remotes/origin/candidates" %
1195 TEST_CONFIG["BRANCHNAME"], ""), 1195 TEST_CONFIG["BRANCHNAME"], ""),
1196 Cmd(("git log --format=%H --grep=\"Port ab12345\" " 1196 Cmd(("git log --format=%H --grep=\"Port ab12345\" "
1197 "--reverse origin/master"), 1197 "--reverse origin/master"),
1198 "ab45678\nab23456"), 1198 "ab45678\nab23456"),
1199 Cmd("git log -1 --format=%s ab45678", "Title1"), 1199 Cmd("git log -1 --format=%s ab45678", "Title1"),
1200 Cmd("git log -1 --format=%s ab23456", "Title2"), 1200 Cmd("git log -1 --format=%s ab23456", "Title2"),
1201 Cmd(("git log --format=%H --grep=\"Port ab23456\" " 1201 Cmd(("git log --format=%H --grep=\"Port ab23456\" "
1202 "--reverse origin/master"), 1202 "--reverse origin/master"),
1203 ""), 1203 ""),
1204 Cmd(("git log --format=%H --grep=\"Port ab34567\" " 1204 Cmd(("git log --format=%H --grep=\"Port ab34567\" "
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" " 1246 Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
1247 "--bypass-hooks --cc \"ulan@chromium.org\"", ""), 1247 "--bypass-hooks --cc \"ulan@chromium.org\"", ""),
1248 Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""), 1248 Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
1249 RL("LGTM"), # Enter LGTM for V8 CL. 1249 RL("LGTM"), # Enter LGTM for V8 CL.
1250 Cmd("git cl presubmit", "Presubmit successfull\n"), 1250 Cmd("git cl presubmit", "Presubmit successfull\n"),
1251 Cmd("git cl land -f --bypass-hooks", "Closing issue\n", 1251 Cmd("git cl land -f --bypass-hooks", "Closing issue\n",
1252 cb=VerifyLand), 1252 cb=VerifyLand),
1253 Cmd("git fetch", ""), 1253 Cmd("git fetch", ""),
1254 Cmd("git log -1 --format=%H --grep=\"" 1254 Cmd("git log -1 --format=%H --grep=\""
1255 "Version 3.22.5.1 (cherry-pick)" 1255 "Version 3.22.5.1 (cherry-pick)"
1256 "\" origin/candidates", 1256 "\" refs/remotes/origin/candidates",
1257 ""), 1257 ""),
1258 Cmd("git fetch", ""), 1258 Cmd("git fetch", ""),
1259 Cmd("git log -1 --format=%H --grep=\"" 1259 Cmd("git log -1 --format=%H --grep=\""
1260 "Version 3.22.5.1 (cherry-pick)" 1260 "Version 3.22.5.1 (cherry-pick)"
1261 "\" origin/candidates", 1261 "\" refs/remotes/origin/candidates",
1262 "hsh_to_tag"), 1262 "hsh_to_tag"),
1263 Cmd("git tag 3.22.5.1 hsh_to_tag", ""), 1263 Cmd("git tag 3.22.5.1 hsh_to_tag", ""),
1264 Cmd("git push origin 3.22.5.1", ""), 1264 Cmd("git push origin 3.22.5.1", ""),
1265 Cmd("git checkout -f some_branch", ""), 1265 Cmd("git checkout -f some_branch", ""),
1266 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""), 1266 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
1267 ]) 1267 ])
1268 1268
1269 # ab12345 and ab34567 are patches. ab23456 (included) and ab45678 are the 1269 # ab12345 and ab34567 are patches. ab23456 (included) and ab45678 are the
1270 # MIPS ports of ab12345. ab56789 is the MIPS port of ab34567. 1270 # MIPS ports of ab12345. ab56789 is the MIPS port of ab34567.
1271 args = ["-f", "-p", extra_patch, "--branch", "candidates", 1271 args = ["-f", "-p", extra_patch, "--branch", "candidates",
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 1494
1495 Review URL: https://codereview.chromium.org/83173002 1495 Review URL: https://codereview.chromium.org/83173002
1496 1496
1497 ------------------------------------------------------------------------""") 1497 ------------------------------------------------------------------------""")
1498 self.assertEquals( 1498 self.assertEquals(
1499 """Prepare push to trunk. Now working on version 3.23.11. 1499 """Prepare push to trunk. Now working on version 3.23.11.
1500 1500
1501 R=danno@chromium.org 1501 R=danno@chromium.org
1502 1502
1503 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) 1503 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)
OLDNEW
« no previous file with comments | « tools/release/common_includes.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698