Skip to content

Commit bb4b4b0

Browse files
committed
test: run common tests file
1 parent 22792fd commit bb4b4b0

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

build.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fn addTestRunner(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
7474
const run_zig_tests = b.addRunArtifact(zig_tests);
7575

7676
const common_tests = b.addTest(.{
77-
.root_source_file = b.path("src/common/root.zig"),
77+
.root_source_file = b.path("src/common/tests.zig"),
7878
.target = target,
7979
.optimize = optimize,
8080
});

src/common/overrides.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ pub fn write_overrides(overrides: OverrideMap, cp: CommonPaths) !void {
9090
try cp.overrides.setEndPos(0);
9191
var file_writer = std.io.bufferedWriter(cp.overrides.writer());
9292

93-
try json.stringify(json.Value{ .object = overrides.backing_map }, .{ .whitespace = .indent_4 }, file_writer.writer());
93+
try json.stringify(json.Value{ .object = overrides.backing_map }, .{ .whitespace = .indent_2 }, file_writer.writer());
9494
_ = try file_writer.write("\n");
9595
try file_writer.flush();
9696
}

src/common/root.zig

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pub const Release = struct {
7575
}
7676
}
7777

78-
pub fn releasefromVersion(v: []const u8) RelError!Self {
78+
pub fn releaseFromVersion(v: []const u8) RelError!Self {
7979
var rel: Release = undefined;
8080
if (streql(v, "master"))
8181
rel = Self{ .spec = .Master }
@@ -113,16 +113,12 @@ pub fn target_name() []const u8 {
113113
return @tagName(default_arch) ++ "-" ++ @tagName(default_os);
114114
}
115115

116-
pub fn streql(cmd: []const u8, key: []const u8) bool {
117-
return std.mem.eql(u8, cmd, key);
116+
pub fn streql(lhs: []const u8, rhs: []const u8) bool {
117+
return std.mem.eql(u8, lhs, rhs);
118118
}
119119

120120
pub fn release_name(alloc: Allocator, rel: Release) ![]const u8 {
121121
const release_string = rel.releaseName();
122122
const dw_target = comptime target_name();
123123
return try std.mem.concat(alloc, u8, &[_][]const u8{ "zig-" ++ dw_target ++ "-", release_string });
124124
}
125-
126-
test {
127-
std.testing.refAllDecls(@This());
128-
}

src/common/tests.zig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ fn make_mock_releases(alloc: Allocator) !std.StringArrayHashMap(json.Value) {
1818
_ = try releases_map.fetchPut("0.10.1", .null);
1919
_ = try releases_map.fetchPut("0.11.0", .null);
2020
_ = try releases_map.fetchPut("0.12.0", .null);
21+
_ = try releases_map.fetchPut("0.13.0", .null);
2122
_ = try releases_map.fetchPut("master", .null);
2223

2324
return releases_map;
@@ -45,7 +46,7 @@ test "Resolve patch version with no patch releases" {
4546
defer releases_map.deinit();
4647
const releases = json.Value{ .object = releases_map };
4748

48-
var rel = try Release.releasefromVersion("0.12");
49+
var rel = try Release.releaseFromVersion("0.12");
4950
try rel.resolve(releases);
5051

5152
const v = try rel.actualVersion(alloc);
@@ -60,7 +61,7 @@ test "Resolve patch version with patch releases" {
6061
defer releases_map.deinit();
6162
const releases = json.Value{ .object = releases_map };
6263

63-
var rel = try Release.releasefromVersion("0.10");
64+
var rel = try Release.releaseFromVersion("0.10");
6465
try rel.resolve(releases);
6566

6667
const v = try rel.actualVersion(alloc);
@@ -75,10 +76,10 @@ test "Resolve stable" {
7576
defer releases_map.deinit();
7677
const releases = json.Value{ .object = releases_map };
7778

78-
var rel = try Release.releasefromVersion("stable");
79+
var rel = try Release.releaseFromVersion("stable");
7980
try rel.resolve(releases);
8081

8182
const v = try rel.actualVersion(alloc);
8283
defer alloc.free(v);
83-
try std.testing.expectEqualStrings("0.12.0", v);
84+
try std.testing.expectEqualStrings("0.13.0", v);
8485
}

0 commit comments

Comments
 (0)