diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-05-29 19:49:10 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-05-29 19:49:10 -0400 |
| commit | 7bfae39c5ccbf7d39a3fe955c47aaa03f9b637a2 (patch) | |
| tree | b131545d340dcd0e52a348db00d3f9cdb9708b75 | |
| parent | 345501a72d9780e66beecd549cf6e56c9cde1a95 (diff) | |
| parent | e716c9ba4b0550159157238ad8e3ef0a136c6c42 (diff) | |
| download | zig-7bfae39c5ccbf7d39a3fe955c47aaa03f9b637a2.tar.gz zig-7bfae39c5ccbf7d39a3fe955c47aaa03f9b637a2.zip | |
Merge branch 'NBonaparte-linuxdynlib'
| -rw-r--r-- | std/dynamic_library.zig | 2 | ||||
| -rw-r--r-- | test/build_examples.zig | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/std/dynamic_library.zig b/std/dynamic_library.zig index e55d6df84f..79e325b81e 100644 --- a/std/dynamic_library.zig +++ b/std/dynamic_library.zig @@ -114,7 +114,7 @@ pub const LinuxDynLib = struct { null, size, os.PROT_READ | os.PROT_EXEC, - os.MAP_PRIVATE | os.MAP_LOCKED, + os.MAP_PRIVATE, fd, 0, ); diff --git a/test/build_examples.zig b/test/build_examples.zig index c75c38b138..d38336939d 100644 --- a/test/build_examples.zig +++ b/test/build_examples.zig @@ -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) { - // 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 + if (builtin.os == builtin.Os.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"); |