From dab1dc79a717bd5b484ada458f99ce17a5c468cb Mon Sep 17 00:00:00 2001 From: NBonaparte Date: Thu, 23 May 2019 00:06:34 -0700 Subject: [PATCH 1/2] LinuxDynLib: remove MAP_LOCKED flag --- std/dynamic_library.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, ); From e716c9ba4b0550159157238ad8e3ef0a136c6c42 Mon Sep 17 00:00:00 2001 From: NBonaparte Date: Thu, 23 May 2019 00:10:46 -0700 Subject: [PATCH 2/2] build_examples: reenable load_dynamic_library --- test/build_examples.zig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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");