In the testsuite, pass $RABBITMQCTL to sub-makes explicitely

dumbbell · dumbbell · commit 0c6bf3fefc68 · 2015-11-19T17:50:13.000+01:00
diff --git a/test/src/com/rabbitmq/tools/Host.java b/test/src/com/rabbitmq/tools/Host.java
@@ -20,6 +20,7 @@
 import com.rabbitmq.client.impl.NetworkConnection;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -101,7 +102,11 @@ public static Process rabbitmqctlIgnoreErrors(String command) throws IOException
     }
 
     public static Process invokeMakeTarget(String command) throws IOException {
-        return executeCommand("cd " + rabbitmqTestDir() + "; " + makeCommand() + " " + command);
+        File rabbitmqctl = new File(rabbitmqctlCommand());
+        return executeCommand(makeCommand() +
+                              " -C \'" + rabbitmqTestDir() + "\'" +
+                              " RABBITMQCTL=\'" + rabbitmqctl.getAbsolutePath() + "\'" +
+                              " " + command);
     }
 
     private static String makeCommand()
