Merge pull request #119 from mathworks/github_startup_issue_117

Run MATLAB command using cd and invoke MATLAB from workspace.

Author: nbhoski

src/main/java/com/mathworks/ci/MatlabCommandStepExecution.java

@@ -63,28 +63,27 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
         final String uniqueTmpFldrName = getUniqueNameForRunnerFile();
         final String uniqueCommandFile =
                 "command_" + getUniqueNameForRunnerFile().replaceAll("-", "_");
-        final FilePath uniqeTmpFolderPath =
+        final FilePath uniqueTmpFolderPath =
                 getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
 
         // Create MATLAB script
-        createMatlabScriptByName(uniqeTmpFolderPath, uniqueCommandFile, workspace, listener);
+        createMatlabScriptByName(uniqueTmpFolderPath, uniqueCommandFile, workspace, listener);
         ProcStarter matlabLauncher;
 
         try {
             matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
-                    uniqueCommandFile, uniqueTmpFldrName);
-            launcher.launch().pwd(uniqeTmpFolderPath).envs(envVars);
+                    "cd('"+ uniqueTmpFolderPath.getRemote().replaceAll("'", "''") +"'); "+ uniqueCommandFile, uniqueTmpFldrName);
             listener.getLogger()
                     .println("#################### Starting command output ####################");
-            return matlabLauncher.pwd(uniqeTmpFolderPath).join();
+            return matlabLauncher.pwd(workspace).join();
 
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());
             return 1;
         } finally {
             // Cleanup the tmp directory
-            if (uniqeTmpFolderPath.exists()) {
-                uniqeTmpFolderPath.deleteRecursive();
+            if (uniqueTmpFolderPath.exists()) {
+                uniqueTmpFolderPath.deleteRecursive();
             }
         }
     }

src/main/java/com/mathworks/ci/RunMatlabCommandBuilder.java

@@ -124,11 +124,11 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
 
         try {
             matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
-                    uniqueCommandFile, uniqueTmpFldrName);
-            launcher.launch().pwd(uniqeTmpFolderPath).envs(envVars);
+                    "cd('"+ uniqeTmpFolderPath.getRemote().replaceAll("'", "''") +"');"+ uniqueCommandFile, uniqueTmpFldrName);
+            
             listener.getLogger()
                     .println("#################### Starting command output ####################");
-            return matlabLauncher.pwd(uniqeTmpFolderPath).join();
+            return matlabLauncher.pwd(workspace).join();
 
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());

src/test/java/com/mathworks/ci/RunMatlabCommandBuilderTest.java

@@ -136,6 +136,22 @@ public void verifyMATLABlaunchedWithDefaultArguments() throws Exception {
         jenkins.assertLogContains("run_matlab_command", build);
     }
 
+    /*
+     * Test To verify MATLAB is launched always from build workspace.
+     * 
+     */
+
+    @Test
+    public void verifyMATLABlaunchedfromWorkspace() throws Exception {
+        this.buildWrapper.setMatlabRootFolder(getMatlabroot("R2017a"));
+        project.getBuildWrappersList().add(this.buildWrapper);
+        scriptBuilder.setMatlabCommand("pwd");
+        project.getBuildersList().add(this.scriptBuilder);
+        FreeStyleBuild build = project.scheduleBuild2(0).get();
+        String workspace = build.getWorkspace().getName();
+        jenkins.assertLogContains("[" + workspace + "]", build);
+    }
+
     /*
      * Test to verify if job fails when invalid MATLAB path is provided and Exception is thrown
      */

src/test/java/com/mathworks/ci/RunMatlabCommandStepTest.java

@@ -1,7 +1,7 @@
 package com.mathworks.ci;
 /**
  * Copyright 2020 The MathWorks, Inc.
- *  
+ * 
  */
 
 import java.io.IOException;
@@ -43,6 +43,23 @@ public void verifyMATLABPathNotSet() throws Exception {
         j.assertLogContains("MATLAB_ROOT", build);
     }
 
+    /*
+     * Verify MATLAB gets invoked from workspace.
+     */
+
+    @Test
+    public void verifyMATLABstartsInWorkspace() throws Exception {
+        DumbSlave s = j.createOnlineSlave();
+        project.setDefinition(
+                new CpsFlowDefinition("node('!master') { runMATLABCommand(command: 'pwd')}", true));
+
+        FilePath workspace = s.getWorkspaceFor(project);
+        String workspaceName = workspace.getName();
+        WorkflowRun build = project.scheduleBuild2(0).get();
+
+        j.assertLogContains(workspaceName, build);
+    }
+
     /*
      * Verify MATLAB is invoked when valid MATLAB is in PATH.
      *
@@ -65,12 +82,11 @@ public void verifyMATLABPathSet() throws Exception {
     public void verifyPipelineOnSlave() throws Exception {
         DumbSlave s = j.createOnlineSlave();
         project.setDefinition(new CpsFlowDefinition(
-                "node('!master') { testMATLABCommand(command: 'pwd')}",
-                true));
+                "node('!master') { testMATLABCommand(command: 'pwd')}", true));
 
         s.getWorkspaceFor(project);
         WorkflowRun build = project.scheduleBuild2(0).get();
-        
+
         j.assertBuildStatusSuccess(build);
     }