authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-29 19:49:10-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-05-29 19:49:10-04:00
log7bfae39c5ccbf7d39a3fe955c47aaa03f9b637a2
treeb131545d340dcd0e52a348db00d3f9cdb9708b75
parent345501a72d9780e66beecd549cf6e56c9cde1a95
parente716c9ba4b0550159157238ad8e3ef0a136c6c42
signaturelock-open Commit is signed but in an unrecognized format.

Merge branch 'NBonaparte-linuxdynlib'

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

std/dynamic_library.zig+1-1
......@@ -114,7 +114,7 @@ pub const LinuxDynLib = struct {
114114 null,
115115 size,
116116 os.PROT_READ | os.PROT_EXEC,
117 os.MAP_PRIVATE | os.MAP_LOCKED,
117 os.MAP_PRIVATE,
118118 fd,
119119 0,
120120 );
test/build_examples.zig+1-3
......@@ -17,9 +17,7 @@ pub fn addCases(cases: *tests.BuildExamplesContext) void {
1717 cases.addBuildFile("test/standalone/use_alias/build.zig");
1818 cases.addBuildFile("test/standalone/brace_expansion/build.zig");
1919 cases.addBuildFile("test/standalone/empty_env/build.zig");
20 if (false) {
21 // TODO this test is disabled because it is failing on the CI server's linux. when this is fixed
22 // enable it for at least linux
20 if (builtin.os == builtin.Os.linux) {
2321 // TODO hook up the DynLib API for windows using LoadLibraryA
2422 // TODO figure out how to make this work on darwin - probably libSystem has dlopen/dlsym in it
2523 cases.addBuildFile("test/standalone/load_dynamic_library/build.zig");