Merge remote-tracking branch 'origin/main' into sb/zen-master

1 files changed, 5 insertions, 2 deletions

diff --git a/xmake.lua b/xmake.lua
index 8a5fe8d2d..0f34d9986 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -121,6 +121,7 @@ end
 
 if is_os("linux") then
     add_cxxflags("-Wno-vla-cxx-extension")
+    add_defines("_GNU_SOURCE")
 end
 
 -- Turn use of undefined cpp macros into errors
@@ -150,7 +151,7 @@ option_end()
 add_define_by_config("ZEN_USE_MIMALLOC", "zenmimalloc")
 
 option("zenrpmalloc")
-    set_default(is_os("windows"))
+    set_default(true)
     set_showmenu(true)
     set_description("Use rpmalloc for faster memory management")
 option_end()
@@ -198,6 +199,7 @@ includes("src/zencore", "src/zencore-test")
 includes("src/zenhttp", "src/zenhttp-test")
 includes("src/zenmaster", "src/zenmaster-test")
 includes("src/zennet", "src/zennet-test")
+includes("src/zenremotestore", "src/zenremotestore-test")
 includes("src/zenstore", "src/zenstore-test")
 includes("src/zenutil", "src/zenutil-test")
 includes("src/zenvfs")
@@ -258,7 +260,7 @@ task("test")
         usage = "xmake test --run=[core|store|server|integration|all]",
         description = "Run Zen tests",
         options = {
-            {'r', "run", "kv", "all", "Run test(s)", " - all", " - core ", " - store", " - server", " - integration"},
+            {'r', "run", "kv", "all", "Run test(s)", " - all", " - core ", " - remotestore", " - store", " - server", " - integration"},
             {'j', "junit", "k", nil, "Enable junit report output"}
         }
     }
@@ -275,6 +277,7 @@ task("test")
             http = "zenhttp-test",
             util = "zenutil-test",
             store = "zenstore-test",
+            remotestore = "zenremotestore-test",
             server = "zenserver",
             integration = "zenserver-test"
         }