Use the MAKE envirobnment variable, and extract a bit of commonality.

Author: Simon MacMullen

test/src/com/rabbitmq/client/test/BrokerTestCase.java

@@ -94,7 +94,7 @@ protected void restart()
 
     protected void bareRestart()
             throws IOException {
-        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+        Host.invokeMakeTarget("restart-app");
     }
 
     public void openConnection()
@@ -248,11 +248,11 @@ protected void clearAllResourceAlarms() throws IOException, InterruptedException
     }
 
     protected void setResourceAlarm(String source) throws IOException, InterruptedException {
-        Host.executeCommand("cd ../rabbitmq-test; make set-resource-alarm SOURCE=" + source);
+        Host.invokeMakeTarget("set-resource-alarm SOURCE=" + source);
     }
 
     protected void clearResourceAlarm(String source) throws IOException, InterruptedException {
-        Host.executeCommand("cd ../rabbitmq-test; make clear-resource-alarm SOURCE=" + source);
+        Host.invokeMakeTarget("clear-resource-alarm SOURCE=" + source);
     }
 
     protected void block() throws IOException, InterruptedException {

test/src/com/rabbitmq/client/test/functional/ClusteredTestBase.java

@@ -124,10 +124,10 @@ public void closeConnection() throws IOException {
     }
 
     protected void stopSecondary() throws IOException {
-        Host.executeCommand("cd ../rabbitmq-test; make stop-secondary-app");
+        Host.invokeMakeTarget("stop-secondary-app");
     }
 
     protected void startSecondary() throws IOException {
-        Host.executeCommand("cd ../rabbitmq-test; make start-secondary-app");
+        Host.invokeMakeTarget("start-secondary-app");
     }
 }

test/src/com/rabbitmq/client/test/server/DeadLetterExchangeDurable.java

@@ -39,9 +39,9 @@ public void testDeadLetterQueueTTLExpiredWhileDown() throws Exception {
         }
 
         closeConnection();
-        Host.executeCommand("cd ../rabbitmq-test; make stop-app");
+        Host.invokeMakeTarget("stop-app");
         Thread.sleep(5000);
-        Host.executeCommand("cd ../rabbitmq-test; make start-app");
+        Host.invokeMakeTarget("start-app");
         openConnection();
         openChannel();
 

test/src/com/rabbitmq/client/test/server/DurableBindingLifecycle.java

@@ -44,14 +44,14 @@ protected void restart() throws IOException {
             alternateConnection = null;
             alternateChannel = null;
 
-            Host.executeCommand("cd ../rabbitmq-test; make restart-secondary-node");
+            Host.invokeMakeTarget("restart-secondary-node");
         }
         restartPrimary();
     }
 
     private void restartPrimary() throws IOException {
         tearDown();
-        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+        bareRestart();
         setUp();
     }
 

test/src/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java

@@ -51,7 +51,7 @@ public void testConnectionQueueSameNode() throws Exception {
     private void restartPrimaryAbruptly() throws IOException {
         connection = null;
         channel = null;
-        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+        bareRestart();
         setUp();
     }
 

test/src/com/rabbitmq/client/test/server/HATests.java

@@ -40,7 +40,7 @@ public static TestSuite suite() {
     public static class SetUp extends TestCase {
         @Override
         protected void setUp() throws Exception {
-            Host.executeCommand("cd ../rabbitmq-test; make enable-ha");
+            Host.invokeMakeTarget("enable-ha");
             HA_TESTS_RUNNING = true;
         }
 
@@ -50,7 +50,7 @@ public void testNothing() {}
     public static class TearDown extends TestCase {
         @Override
         protected void tearDown() throws Exception {
-            Host.executeCommand("cd ../rabbitmq-test; make disable-ha");
+            Host.invokeMakeTarget("disable-ha");
             HA_TESTS_RUNNING = false;
         }
 

test/src/com/rabbitmq/tools/Host.java

@@ -100,6 +100,24 @@ public static Process rabbitmqctlIgnoreErrors(String command) throws IOException
         return executeCommandIgnoringErrors("../rabbitmq-server/scripts/rabbitmqctl " + command);
     }
 
+    public static Process invokeMakeTarget(String command) throws IOException {
+        return executeCommand("cd ../rabbitmq-test; " + makeCommand() + " " + command);
+    }
+
+    private static String makeCommand()
+    {
+        // Get the make(1) executable to use from the environment:
+        // make(1) provides the path to itself in $MAKE.
+        String makecmd = System.getenv("MAKE");
+
+        // Default to "make" if the environment variable is unset.
+        if (makecmd == null) {
+            makecmd = "make";
+        }
+
+        return makecmd;
+    }
+
     public static void closeConnection(String pid) throws IOException {
         rabbitmqctl("close_connection '" + pid + "' 'Closed via rabbitmqctl'");
     }