Run MATLAB command using cd and invoke MATLAB from workspace.

Author: Nikhil Bhoski

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

@@ -72,11 +72,10 @@ 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() +"');"+ 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/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);
+                    "cd('"+ uniqeTmpFolderPath.getRemote() +"');"+ uniqueCommandFile, uniqueTmpFldrName);
             launcher.launch().pwd(uniqeTmpFolderPath).envs(envVars);
             listener.getLogger()
                     .println("#################### Starting command output ####################");
-            return matlabLauncher.pwd(uniqeTmpFolderPath).join();
+            return matlabLauncher.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

@@ -42,7 +42,25 @@ public void verifyMATLABPathNotSet() throws Exception {
         WorkflowRun build = project.scheduleBuild2(0).get();
         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.
      *