Commit 7bfae39c5ccbf7d39a3fe955c47aaa03f9b637a2 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-05-29 19:49:10-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-05-29 19:49:10-04:00
log	7bfae39c5ccbf7d39a3fe955c47aaa03f9b637a2
tree	b131545d340dcd0e52a348db00d3f9cdb9708b75
parent	345501a72d9780e66beecd549cf6e56c9cde1a95
parent	e716c9ba4b0550159157238ad8e3ef0a136c6c42
signature	Commit is signed but in an unrecognized format.

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

std/dynamic_library.zig+1-1

...	@@ -114,7 +114,7 @@ pub const LinuxDynLib = struct {	...	@@ -114,7 +114,7 @@ pub const LinuxDynLib = struct {
114	null,	114	null,
115	size,	115	size,
116	os.PROT_READ \| os.PROT_EXEC,	116	os.PROT_READ \| os.PROT_EXEC,
117	os.MAP_PRIVATE \| os.MAP_LOCKED,	117	os.MAP_PRIVATE,
118	fd,	118	fd,
119	0,	119	0,
120	);	120	);

test/build_examples.zig+1-3

 @@ -17,9 +17,7 @@ pub fn addCases(cases: *tests.BuildExamplesContext) void {
     cases.addBuildFile("test/standalone/use_alias/build.zig");
     cases.addBuildFile("test/standalone/brace_expansion/build.zig");
     cases.addBuildFile("test/standalone/empty_env/build.zig");
-    if (false) {
+    if (builtin.os == builtin.Os.linux) {
-        // TODO this test is disabled because it is failing on the CI server's linux. when this is fixed
-        // enable it for at least linux
         // TODO hook up the DynLib API for windows using LoadLibraryA
         // TODO figure out how to make this work on darwin - probably libSystem has dlopen/dlsym in it
         cases.addBuildFile("test/standalone/load_dynamic_library/build.zig");