zig

commit 7bfae39c5ccbf7d39a3fe955c47aaa03f9b637a2 (tree)
parent 345501a72d9780e66beecd549cf6e56c9cde1a95
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 29 May 2019 19:49:10 -0400

Merge branch 'NBonaparte-linuxdynlib'

Diffstat:
M
std/dynamic_library.zig
 | 
2
+-
M
test/build_examples.zig
 | 
4
+---

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git 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
@@ -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");