Skip to content

Commit c3ccf4d

Browse files
committed
Zipmerge: substitute CPython archives with dummy ones
1 parent 67d622f commit c3ccf4d

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

misc/bazel/internal/zipmerge/zipmerge_test.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,35 +108,36 @@ const char* zipmerge(Args*... inputs) {
108108
}
109109

110110
TEST(Zipmerge, Identity) {
111-
expect_same_file(zipmerge("out.zip", "CPython.zip"), "CPython.zip");
111+
expect_same_file(zipmerge("out.zip", "directory.zip"), "directory.zip");
112112
}
113113

114114
TEST(Zipmerge, Idempotent) {
115-
expect_same_file(zipmerge("out.zip", "CPython.zip", "CPython.zip", "CPython.zip"), "CPython.zip");
115+
expect_same_file(zipmerge("out.zip", "directory.zip", "directory.zip", "directory.zip"),
116+
"directory.zip");
116117
}
117118

118119
TEST(Zipmerge, RemoveEverything) {
119-
expect_same_file(zipmerge("--remove=CPython", "out.zip", "CPython.zip"), "empty.zip");
120+
expect_same_file(zipmerge("--remove=directory", "out.zip", "directory.zip"), "empty.zip");
120121
}
121122

122123
TEST(Zipmerge, RemoveEverythingWildcard) {
123-
expect_same_file(zipmerge("--remove=*on", "out.zip", "CPython.zip"), "empty.zip");
124+
expect_same_file(zipmerge("--remove=*ory", "out.zip", "directory.zip"), "empty.zip");
124125
}
125126

126127
TEST(Zipmerge, RemovePrefixedPaths) {
127-
expect_same_file(zipmerge("--remove=My/CPython", "out.zip", "--prefix=My", "CPython.zip"),
128+
expect_same_file(zipmerge("--remove=My/directory", "out.zip", "--prefix=My", "directory.zip"),
128129
"empty.zip");
129130
}
130131
TEST(Zipmerge, RemoveSome) {
131-
expect_same_file(zipmerge("--remove=CPython/Extensions.qll", "--remove=CPython/ReturnTypeTrap.ql",
132-
"out.zip", "CPython.zip"),
133-
"CPython-partial.zip");
132+
expect_same_file(
133+
zipmerge("--remove=directory/b.txt", "--remove=directory/c.txt", "out.zip", "directory.zip"),
134+
"directory-partial.zip");
134135
}
135136

136137
TEST(Zipmerge, RemoveSomeWildcard) {
137-
expect_same_file(zipmerge("--remove=CPython/E*.qll", "--remove=CPython/R*", "--remove=CP*l",
138-
"out.zip", "CPython.zip"),
139-
"CPython-partial.zip");
138+
expect_same_file(zipmerge("--remove=directory/b*t", "--remove=directory/c*", "--remove=dir*t",
139+
"out.zip", "directory.zip"),
140+
"directory-partial.zip");
140141
}
141142

142143
TEST(Zipmerge, Prefix) {

0 commit comments

Comments
 (0)