authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-05-16 13:10:01+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-05-16 13:10:01+03:00
log6c10075dd3f26f7793e76f2540a5c853edb6d3a0
tree0f49ba0aa0c45d5023f5756c507aaa9586fb189d
parentf8b99331a2ca98f0e938c8caaf1cd232ad1e9fa3
parentb747d4d1cedc20ec1224ee6b2e788c5627464e1f
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #5350 from yvt/test-global-linkage

Enable the test `standalone/global_linkage`

2 files changed, 1 insertions(+), 4 deletions(-)

test/standalone.zig+1
...@@ -11,6 +11,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {...@@ -11,6 +11,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
11 cases.addBuildFile("test/standalone/main_pkg_path/build.zig");11 cases.addBuildFile("test/standalone/main_pkg_path/build.zig");
12 cases.addBuildFile("test/standalone/shared_library/build.zig");12 cases.addBuildFile("test/standalone/shared_library/build.zig");
13 cases.addBuildFile("test/standalone/mix_o_files/build.zig");13 cases.addBuildFile("test/standalone/mix_o_files/build.zig");
14 cases.addBuildFile("test/standalone/global_linkage/build.zig");
14 cases.addBuildFile("test/standalone/static_c_lib/build.zig");15 cases.addBuildFile("test/standalone/static_c_lib/build.zig");
15 cases.addBuildFile("test/standalone/issue_339/build.zig");16 cases.addBuildFile("test/standalone/issue_339/build.zig");
16 cases.addBuildFile("test/standalone/issue_794/build.zig");17 cases.addBuildFile("test/standalone/issue_794/build.zig");
test/standalone/global_linkage/build.zig-4
...@@ -2,19 +2,15 @@ const Builder = @import("std").build.Builder;...@@ -2,19 +2,15 @@ const Builder = @import("std").build.Builder;
22
3pub fn build(b: *Builder) void {3pub fn build(b: *Builder) void {
4 const mode = b.standardReleaseOptions();4 const mode = b.standardReleaseOptions();
5 const target = b.standardTargetOptions(null);
65
7 const obj1 = b.addStaticLibrary("obj1", "obj1.zig");6 const obj1 = b.addStaticLibrary("obj1", "obj1.zig");
8 obj1.setBuildMode(mode);7 obj1.setBuildMode(mode);
9 obj1.setTheTarget(target);
108
11 const obj2 = b.addStaticLibrary("obj2", "obj2.zig");9 const obj2 = b.addStaticLibrary("obj2", "obj2.zig");
12 obj2.setBuildMode(mode);10 obj2.setBuildMode(mode);
13 obj2.setTheTarget(target);
1411
15 const main = b.addTest("main.zig");12 const main = b.addTest("main.zig");
16 main.setBuildMode(mode);13 main.setBuildMode(mode);
17 main.setTheTarget(target);
18 main.linkLibrary(obj1);14 main.linkLibrary(obj1);
19 main.linkLibrary(obj2);15 main.linkLibrary(obj2);
2016