(couchdb) 01/01: feat(`nouveau`): change path handling for Windows (and *nix) to run tests

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ronny pushed a commit to branch nouveau/path-handling
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 92b187451fb091f8f133f223c67d24839fbc7da5
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Thu Feb 29 22:24:11 2024 +0100

    feat(`nouveau`): change path handling for Windows (and *nix) to run tests
---
 dev/run | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/run b/dev/run
index 6fcc8927f..a631377e0 100755
--- a/dev/run
+++ b/dev/run
@@ -428,7 +428,7 @@ def generate_nouveau_config(ctx):
         content = handle.read()
 
     for key in config:
-        content = re.sub("{{%s}}" % key, str(config[key]), content)
+        content = content.replace("{{%s}}" % key, f"'{config[key]}'")
 
     with open(tgt, "w") as handle:
         handle.write(content)
@@ -540,23 +540,23 @@ def maybe_boot_nouveau(ctx):
 
 def boot_nouveau(ctx):
     config = os.path.join(ctx["devdir"], "lib", "nouveau.yaml")
+    gradle = "gradlew.bat" if os.name == "nt" else "gradlew"
     cmd = [
-        "./gradlew",
+        os.path.join(ctx["rootdir"], "nouveau", gradle),
         "run",
         "--args",
-        "server {}".format(config),
+        f"server '{config}'"
     ]
     logfname = os.path.join(ctx["devdir"], "logs", "nouveau.log")
     log = open(logfname, "w")
     return sp.Popen(
         cmd,
-        cwd="nouveau",
+        cwd=os.path.join(ctx["rootdir"], "nouveau"),
         stdin=sp.PIPE,
         stdout=log,
         stderr=sp.STDOUT,
     )
 
-
 JAVA_VERSION_RE = re.compile(r'"(\d+\.\d+).*"')