Skip to content

Commit 95f9f9d

Browse files
author
Saurabh Agarwal
authored
Merge pull request #1127 from cljohnso/windowsBuild
Correct Galvan-based test failures on Windows
2 parents 984762c + 1500dc9 commit 95f9f9d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public String[] build() {
8989
if (builtCommand == null) {
9090
try {
9191
installServer();
92-
Path basePath = kitDir.resolve("server").resolve("bin").resolve("start-tc-server");
93-
String startScript = isWindows() ? basePath + ".bat" : basePath + ".sh";
92+
Path basePath = serverWorkingDir.resolve(kitDir).resolve("server").resolve("bin").resolve("start-tc-server").toAbsolutePath().normalize();
93+
String startScript = isWindows() ? "\"" + basePath + ".bat\"" : basePath + ".sh";
9494
if (consistentStartup) {
9595
builtCommand = new String[]{startScript, "-c", "-f", tcConfig.toString(), "-n", serverName};
9696
} else {

0 commit comments

Comments
 (0)