OLD | NEW |
---|---|
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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
922 Cmd("git checkout -f origin/master", ""), | 922 Cmd("git checkout -f origin/master", ""), |
923 Cmd("git branch", ""), | 923 Cmd("git branch", ""), |
924 Cmd("git log -1 --format=\"%H %T\" push_hash", "push_hash tree_hash"), | 924 Cmd("git log -1 --format=\"%H %T\" push_hash", "push_hash tree_hash"), |
925 Cmd("git log -200 --format=\"%H %T\" refs/pending/heads/master", | 925 Cmd("git log -200 --format=\"%H %T\" refs/pending/heads/master", |
926 "not_right wrong\npending_hash tree_hash\nsome other\n"), | 926 "not_right wrong\npending_hash tree_hash\nsome other\n"), |
927 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 927 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
928 Cmd("git tag", self.TAGS), | 928 Cmd("git tag", self.TAGS), |
929 Cmd("git checkout -f origin/master -- src/version.cc", | 929 Cmd("git checkout -f origin/master -- src/version.cc", |
930 "", cb=self.WriteFakeVersionFile), | 930 "", cb=self.WriteFakeVersionFile), |
931 Cmd("git log -1 --format=%H 3.22.4", "release_hash\n"), | 931 Cmd("git log -1 --format=%H 3.22.4", "release_hash\n"), |
932 Cmd("git log -1 --format=%s release_hash", | 932 Cmd("git log -1 --format=%s release_hash", "Version 3.22.4\n"), |
933 "Version 3.22.4 (based on abc3)\n"), | 933 Cmd("git log -1 --format=%H release_hash^", "abc3\n"), |
934 Cmd("git log --format=%H abc3..push_hash", "rev1\n"), | 934 Cmd("git log --format=%H abc3..push_hash", "rev1\n"), |
935 Cmd("git log -1 --format=%s rev1", "Log text 1.\n"), | 935 Cmd("git log -1 --format=%s rev1", "Log text 1.\n"), |
936 Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"), | 936 Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"), |
937 Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"), | 937 Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"), |
938 Cmd("git reset --hard origin/master", ""), | 938 Cmd("git reset --hard origin/master", ""), |
939 Cmd("git checkout -b work-branch pending_hash", ""), | 939 Cmd("git checkout -b work-branch pending_hash", ""), |
940 Cmd("git checkout -f 3.22.4 -- ChangeLog", "", cb=ResetChangeLog), | 940 Cmd("git checkout -f 3.22.4 -- ChangeLog", "", cb=ResetChangeLog), |
941 Cmd("git checkout -f 3.22.4 -- src/version.cc", "", | 941 Cmd("git checkout -f 3.22.4 -- src/version.cc", "", |
942 cb=self.WriteFakeVersionFile), | 942 cb=self.WriteFakeVersionFile), |
943 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", | 943 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1008 TextToFile("Some line\n \"v8_revision\": \"123444\",\n some line", | 1008 TextToFile("Some line\n \"v8_revision\": \"123444\",\n some line", |
1009 os.path.join(chrome_dir, "DEPS")) | 1009 os.path.join(chrome_dir, "DEPS")) |
1010 def WriteDeps(): | 1010 def WriteDeps(): |
1011 TextToFile("Some line\n \"v8_revision\": \"22624\",\n some line", | 1011 TextToFile("Some line\n \"v8_revision\": \"22624\",\n some line", |
1012 os.path.join(chrome_dir, "DEPS")) | 1012 os.path.join(chrome_dir, "DEPS")) |
1013 | 1013 |
1014 expectations = [ | 1014 expectations = [ |
1015 Cmd("git fetch origin", ""), | 1015 Cmd("git fetch origin", ""), |
1016 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1016 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
1017 Cmd("git tag", self.TAGS), | 1017 Cmd("git tag", self.TAGS), |
1018 Cmd("git log -1 --format=%H 3.22.4", "push_hash\n"), | 1018 Cmd("git log -1 --format=%H 3.22.4", "push_hash\n"), |
Michael Achenbach
2015/02/12 10:38:55
That under the tag 3.22.4 is the version 3.22.5 wa
| |
1019 Cmd("git log -1 --format=%s push_hash", | 1019 Cmd("git log -1 --format=%s push_hash", |
1020 "Version 3.22.5 (based on abc)\n"), | 1020 "Version 3.22.4 (based on abc)\n"), |
1021 Cmd("git log -1 --format=%H 3.22.4", "push_hash\n"), | |
1022 Cmd("git log -1 --format=%s push_hash", | |
1023 "Version 3.22.4 (based on abc)"), | |
1024 Cmd("git describe --tags last_roll_hsh", "3.22.2.1"), | |
1025 Cmd("git log -1 --format=%H 3.22.2", "last_roll_base_hash"), | |
1026 Cmd("git log -1 --format=%s last_roll_base_hash", "Version 3.22.2"), | |
1027 Cmd("git log -1 --format=%H last_roll_base_hash^", | |
1028 "last_roll_master_hash"), | |
1021 URL("https://chromium-build.appspot.com/p/chromium/sheriff_v8.js", | 1029 URL("https://chromium-build.appspot.com/p/chromium/sheriff_v8.js", |
1022 "document.write('g_name')"), | 1030 "document.write('g_name')"), |
1023 Cmd("git status -s -uno", "", cwd=chrome_dir), | 1031 Cmd("git status -s -uno", "", cwd=chrome_dir), |
1024 Cmd("git checkout -f master", "", cwd=chrome_dir), | 1032 Cmd("git checkout -f master", "", cwd=chrome_dir), |
1025 Cmd("gclient sync --nohooks", "syncing...", cwd=chrome_dir), | 1033 Cmd("gclient sync --nohooks", "syncing...", cwd=chrome_dir), |
1026 Cmd("git pull", "", cwd=chrome_dir), | 1034 Cmd("git pull", "", cwd=chrome_dir), |
1027 Cmd("git fetch origin", ""), | 1035 Cmd("git fetch origin", ""), |
1028 Cmd("git new-branch v8-roll-push_hash", "", cwd=chrome_dir), | 1036 Cmd("git new-branch v8-roll-push_hash", "", cwd=chrome_dir), |
1029 Cmd("roll-dep v8 push_hash", "rolled", cb=WriteDeps, cwd=chrome_dir), | 1037 Cmd("roll-dep v8 push_hash", "rolled", cb=WriteDeps, cwd=chrome_dir), |
1030 Cmd(("git commit -am \"Update V8 to version 3.22.5 " | 1038 Cmd(("git commit -am \"Update V8 to version 3.22.4 " |
1031 "(based on abc).\n\n" | 1039 "(based on abc).\n\n" |
1040 "Summary of changes available at:\n" | |
1041 "https://chromium.googlesource.com/v8/v8/+log/last_rol..abc\n\n" | |
1032 "Please reply to the V8 sheriff c_name@chromium.org in " | 1042 "Please reply to the V8 sheriff c_name@chromium.org in " |
1033 "case of problems.\n\nTBR=c_name@chromium.org\" " | 1043 "case of problems.\n\nTBR=c_name@chromium.org\" " |
1034 "--author \"author@chromium.org <author@chromium.org>\""), | 1044 "--author \"author@chromium.org <author@chromium.org>\""), |
1035 "", cwd=chrome_dir), | 1045 "", cwd=chrome_dir), |
1036 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f", "", | 1046 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f", "", |
1037 cwd=chrome_dir), | 1047 cwd=chrome_dir), |
1038 ] | 1048 ] |
1039 self.Expect(expectations) | 1049 self.Expect(expectations) |
1040 | 1050 |
1041 args = ["-a", "author@chromium.org", "-c", chrome_dir, | 1051 args = ["-a", "author@chromium.org", "-c", chrome_dir, |
1042 "--sheriff", "--googlers-mapping", googlers_mapping_py, | 1052 "--sheriff", "--googlers-mapping", googlers_mapping_py, |
1043 "-r", "reviewer@chromium.org"] | 1053 "-r", "reviewer@chromium.org", |
1054 "--last-roll", "last_roll_hsh"] | |
1044 ChromiumRoll(TEST_CONFIG, self).Run(args) | 1055 ChromiumRoll(TEST_CONFIG, self).Run(args) |
1045 | 1056 |
1046 deps = FileToText(os.path.join(chrome_dir, "DEPS")) | 1057 deps = FileToText(os.path.join(chrome_dir, "DEPS")) |
1047 self.assertTrue(re.search("\"v8_revision\": \"22624\"", deps)) | 1058 self.assertTrue(re.search("\"v8_revision\": \"22624\"", deps)) |
1048 | 1059 |
1049 def testCheckLastPushRecently(self): | 1060 def testCheckLastPushRecently(self): |
1050 self.Expect([ | 1061 self.Expect([ |
1051 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1062 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
1052 Cmd("git tag", self.TAGS), | 1063 Cmd("git tag", self.TAGS), |
1053 Cmd("git log -1 --format=%H 3.22.4", "release_hash\n"), | 1064 Cmd("git log -1 --format=%H 3.22.4", "release_hash\n"), |
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1494 | 1505 |
1495 Review URL: https://codereview.chromium.org/83173002 | 1506 Review URL: https://codereview.chromium.org/83173002 |
1496 | 1507 |
1497 ------------------------------------------------------------------------""") | 1508 ------------------------------------------------------------------------""") |
1498 self.assertEquals( | 1509 self.assertEquals( |
1499 """Prepare push to trunk. Now working on version 3.23.11. | 1510 """Prepare push to trunk. Now working on version 3.23.11. |
1500 | 1511 |
1501 R=danno@chromium.org | 1512 R=danno@chromium.org |
1502 | 1513 |
1503 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1514 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
OLD | NEW |