tools/release/test_scripts.py - Issue 959713003: Add public version macros.

Unified Diff: tools/release/test_scripts.py

Issue 959713003: Add public version macros. (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 side-by-side diff with in-line comments

Index: tools/release/test_scripts.py

diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py

index 7aeffa924443c45729d600960c3fbfda3a125bb3..6fc306550543de515b2d48f93ebafd70e0492c01 100644

--- a/tools/release/test_scripts.py

+++ b/tools/release/test_scripts.py

@@ -361,12 +361,12 @@ class ScriptTest(unittest.TestCase):

with open(version_file, "w") as f:

f.write(" // Some line...\n")

f.write("\n")

- f.write("#define MAJOR_VERSION %s\n" % major)

- f.write("#define MINOR_VERSION %s\n" % minor)

- f.write("#define BUILD_NUMBER %s\n" % build)

- f.write("#define PATCH_LEVEL %s\n" % patch)

+ f.write("#define V8_MAJOR_VERSION %s\n" % major)

+ f.write("#define V8_MINOR_VERSION %s\n" % minor)

+ f.write("#define V8_BUILD_NUMBER %s\n" % build)

+ f.write("#define V8_PATCH_LEVEL %s\n" % patch)

f.write(" // Some line...\n")

- f.write("#define IS_CANDIDATE_VERSION 0\n")

+ f.write("#define V8_IS_CANDIDATE_VERSION 0\n")

def MakeStep(self):

"""Convenience wrapper."""

@@ -528,10 +528,10 @@ class ScriptTest(unittest.TestCase):

" too much\n"

" trailing", cl)

- self.assertEqual("//\n#define BUILD_NUMBER 3\n",

- MSub(r"(?<=#define BUILD_NUMBER)(?P<space>\s+)\d*$",

+ self.assertEqual("//\n#define V8_BUILD_NUMBER 3\n",

+ MSub(r"(?<=#define V8_BUILD_NUMBER)(?P<space>\s+)\d*$",

r"\g<space>3",

- "//\n#define BUILD_NUMBER 321\n"))

+ "//\n#define V8_BUILD_NUMBER 321\n"))

def testPreparePushRevision(self):

# Tests the default push hash used when the --revision option is not set.

@@ -629,7 +629,7 @@ test_tag

self.Expect([

Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),

Cmd("git tag", self.TAGS),

- Cmd("git checkout -f origin/master -- src/version.cc",

+ Cmd("git checkout -f origin/master -- include/v8-version.h",

"", cb=lambda: self.WriteFakeVersionFile(3, 22, 6)),

])

@@ -750,11 +750,12 @@ Performance and stability improvements on all platforms."""

self.assertEquals(commit_msg, commit)

version = FileToText(

os.path.join(TEST_CONFIG["DEFAULT_CWD"], VERSION_FILE))

- self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version))

- self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version))

- self.assertFalse(re.search(r"#define BUILD_NUMBER\s+6", version))

- self.assertTrue(re.search(r"#define PATCH_LEVEL\s+0", version))

- self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version))

+ self.assertTrue(re.search(r"#define V8_MINOR_VERSION\s+22", version))

+ self.assertTrue(re.search(r"#define V8_BUILD_NUMBER\s+5", version))

+ self.assertFalse(re.search(r"#define V8_BUILD_NUMBER\s+6", version))

+ self.assertTrue(re.search(r"#define V8_PATCH_LEVEL\s+0", version))

+ self.assertTrue(

+ re.search(r"#define V8_IS_CANDIDATE_VERSION\s+0", version))

# Check that the change log on the candidates branch got correctly

# modified.

@@ -787,7 +788,7 @@ Performance and stability improvements on all platforms."""

TEST_CONFIG["BRANCHNAME"]), ""),

Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),

Cmd("git tag", self.TAGS),

- Cmd("git checkout -f origin/master -- src/version.cc",

+ Cmd("git checkout -f origin/master -- include/v8-version.h",

"", cb=self.WriteFakeVersionFile),

Cmd("git log -1 --format=%H 3.22.4", "release_hash\n"),

Cmd("git log -1 --format=%s release_hash",

@@ -811,7 +812,7 @@ Performance and stability improvements on all platforms."""

Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""),

Cmd("git checkout -f origin/candidates -- ChangeLog", "",

cb=ResetChangeLog),

- Cmd("git checkout -f origin/candidates -- src/version.cc", "",

+ Cmd("git checkout -f origin/candidates -- include/v8-version.h", "",

cb=self.WriteFakeVersionFile),

Cmd("git commit -am \"%s\"" % commit_msg_squashed, ""),

]

@@ -891,11 +892,12 @@ Performance and stability improvements on all platforms."""