Merge pull request #1128 from saurabhagas/fixes

Fixes

Author: Saurabh Agarwal

galvan-support/src/main/java/org/terracotta/testing/config/DefaultStartupCommandBuilder.java

@@ -22,6 +22,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.terracotta.testing.demos.TestHelpers.isWindows;
@@ -84,13 +85,22 @@ protected void installServer() throws IOException {
     }
   }
 
+  /**
+   * Returns a normalized absolute path to the shell/bat script, and quotes the windows path to avoid issues with special path chars.
+   * @param scriptPath path to the script from the base kit
+   * @return string representation of processed path
+   */
+  protected String getAbsolutePath(Path scriptPath) {
+    Path basePath =  getServerWorkingDir().resolve(getKitDir()).resolve(scriptPath).toAbsolutePath().normalize();
+    return isWindows() ? "\"" + basePath + ".bat\"" : basePath + ".sh";
+  }
+
   @Override
   public String[] build() {
     if (builtCommand == null) {
       try {
         installServer();
-        Path basePath = serverWorkingDir.resolve(kitDir).resolve("server").resolve("bin").resolve("start-tc-server").toAbsolutePath().normalize();
-        String startScript = isWindows() ? "\"" + basePath + ".bat\"" : basePath + ".sh";
+        String startScript = getAbsolutePath(Paths.get("server","bin", "start-tc-server"));
         if (consistentStartup) {
           builtCommand = new String[]{startScript, "-c", "-f", tcConfig.toString(), "-n", serverName};
         } else {

galvan-support/src/main/java/org/terracotta/testing/config/TcConfigBuilder.java

@@ -15,8 +15,6 @@
  */
 package org.terracotta.testing.config;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -66,7 +64,7 @@ public String build() {
       Integer groupPort = serverGroupPorts.get(i);
       String oneServer =
           "    <server host=\"localhost\" name=\"" + serverName + "\">\n"
-              + "      <logs>" + Paths.get(serverName, "logs").toString() + "</logs>\n"
+              + "      <logs>logs</logs>\n"
               + "      <tsa-port>" + port + "</tsa-port>\n"
               + "      <tsa-group-port>" + groupPort + "</tsa-group-port>\n"
               + "    </server>\n";