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

Side by Side Diff: tools/push-to-trunk/test_scripts.py

Issue 685623004: Fix svn commit for deleted files in release scripts. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « tools/push-to-trunk/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 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 cb=self.WriteFakeVersionFile), 956 cb=self.WriteFakeVersionFile),
957 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", 957 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
958 cb=CheckSVNCommit), 958 cb=CheckSVNCommit),
959 # TODO(machenbach): Change test to pure git after flag day. 959 # TODO(machenbach): Change test to pure git after flag day.
960 # Cmd("git push origin", ""), 960 # Cmd("git push origin", ""),
961 Cmd("git diff HEAD^ HEAD", "patch content"), 961 Cmd("git diff HEAD^ HEAD", "patch content"),
962 Cmd("svn update", "", cwd=svn_root), 962 Cmd("svn update", "", cwd=svn_root),
963 Cmd("svn status", "", cwd=svn_root), 963 Cmd("svn status", "", cwd=svn_root),
964 Cmd("patch -d trunk -p1 -i %s" % 964 Cmd("patch -d trunk -p1 -i %s" %
965 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root), 965 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root),
966 Cmd("svn add --force trunk", "", cwd=svn_root), 966 Cmd("svn status", "M OWNERS\n? new_file\n! AUTHORS",
967 cwd=svn_root),
968 Cmd("svn add --force new_file", "", cwd=svn_root),
969 Cmd("svn delete --force AUTHORS", "", cwd=svn_root),
967 Cmd("svn commit --non-interactive --username=author@chromium.org " 970 Cmd("svn commit --non-interactive --username=author@chromium.org "
968 "--config-dir=[CONFIG_DIR] " 971 "--config-dir=[CONFIG_DIR] "
969 "-m \"Version 3.22.5 (based on push_hash)\"", 972 "-m \"Version 3.22.5 (based on push_hash)\"",
970 "", cwd=svn_root), 973 "", cwd=svn_root),
971 Cmd("git fetch", ""), 974 Cmd("git fetch", ""),
972 Cmd("git log -1 --format=%H --grep=" 975 Cmd("git log -1 --format=%H --grep="
973 "\"Version 3.22.5 (based on push_hash)\"" 976 "\"Version 3.22.5 (based on push_hash)\""
974 " origin/candidates", "hsh_to_tag"), 977 " origin/candidates", "hsh_to_tag"),
975 Cmd("git tag 3.22.5 hsh_to_tag", ""), 978 Cmd("git tag 3.22.5 hsh_to_tag", ""),
976 Cmd("git push https://chromium.googlesource.com/v8/v8 3.22.5", ""), 979 Cmd("git push https://chromium.googlesource.com/v8/v8 3.22.5", ""),
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1779 1782
1780 def testBumpUpVersionSvn(self): 1783 def testBumpUpVersionSvn(self):
1781 svn_root = self.MakeEmptyTempDirectory() 1784 svn_root = self.MakeEmptyTempDirectory()
1782 expectations = self._bumpUpVersion() 1785 expectations = self._bumpUpVersion()
1783 expectations += [ 1786 expectations += [
1784 Cmd("git diff HEAD^ HEAD", "patch content"), 1787 Cmd("git diff HEAD^ HEAD", "patch content"),
1785 Cmd("svn update", "", cwd=svn_root), 1788 Cmd("svn update", "", cwd=svn_root),
1786 Cmd("svn status", "", cwd=svn_root), 1789 Cmd("svn status", "", cwd=svn_root),
1787 Cmd("patch -d branches/bleeding_edge -p1 -i %s" % 1790 Cmd("patch -d branches/bleeding_edge -p1 -i %s" %
1788 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root), 1791 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root),
1789 Cmd("svn add --force branches/bleeding_edge", "", cwd=svn_root), 1792 Cmd("svn status", "M src/version.cc", cwd=svn_root),
1790 Cmd("svn commit --non-interactive --username=author@chromium.org " 1793 Cmd("svn commit --non-interactive --username=author@chromium.org "
1791 "--config-dir=[CONFIG_DIR] " 1794 "--config-dir=[CONFIG_DIR] "
1792 "-m \"[Auto-roll] Bump up version to 3.11.6.0\"", 1795 "-m \"[Auto-roll] Bump up version to 3.11.6.0\"",
1793 "", cwd=svn_root), 1796 "", cwd=svn_root),
1794 Cmd("git checkout -f master", ""), 1797 Cmd("git checkout -f master", ""),
1795 Cmd("git branch", "auto-bump-up-version\n* master"), 1798 Cmd("git branch", "auto-bump-up-version\n* master"),
1796 Cmd("git branch -D auto-bump-up-version", ""), 1799 Cmd("git branch -D auto-bump-up-version", ""),
1797 ] 1800 ]
1798 self.Expect(expectations) 1801 self.Expect(expectations)
1799 1802
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 1859
1857 Review URL: https://codereview.chromium.org/83173002 1860 Review URL: https://codereview.chromium.org/83173002
1858 1861
1859 ------------------------------------------------------------------------""") 1862 ------------------------------------------------------------------------""")
1860 self.assertEquals( 1863 self.assertEquals(
1861 """Prepare push to trunk. Now working on version 3.23.11. 1864 """Prepare push to trunk. Now working on version 3.23.11.
1862 1865
1863 R=danno@chromium.org 1866 R=danno@chromium.org
1864 1867
1865 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) 1868 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)
OLDNEW
« no previous file with comments | « tools/push-to-trunk/common_includes.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698