Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 4aef46a

Browse files
author
Nikhil Bhoski
committed
handdled cache issue in pom
1 parent dfd6dec commit 4aef46a

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@
124124
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v0/run-matlab-command.zip</url>
125125
<unpack>true</unpack>
126126
<outputDirectory>${basedir}/src/main/resources</outputDirectory>
127+
<skipCache>true</skipCache>
128+
<overwrite>true</overwrite>
127129
</configuration>
128130
</execution>
129131
<execution>
@@ -136,6 +138,8 @@
136138
<url>https://ssd.mathworks.com/supportfiles/ci/matlab-script-generator/v0/matlab-script-generator.zip</url>
137139
<unpack>false</unpack>
138140
<outputDirectory>${basedir}/src/main/resources</outputDirectory>
141+
<skipCache>true</skipCache>
142+
<overwrite>true</overwrite>
139143
</configuration>
140144
</execution>
141145
</executions>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
6060
try {
6161
FilePath genScriptLocation =
6262
getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
63-
final String cmdPrefix = "addpath(genpath('" + genScriptLocation.getRemote() + "')); ";
63+
final String cmdPrefix =
64+
"addpath('" + genScriptLocation.getRemote().replaceAll("'", "''") + "'); ";
6465
final String matlabFunctionName = MatlabBuilderConstants.MATLAB_TEST_RUNNER_FILE_PREFIX
6566
+ genScriptLocation.getBaseName().replaceAll("-", "_");
6667

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
262262
public String constructCommandForTest(String inputArguments, FilePath scriptPath) {
263263
final String matlabFunctionName = MatlabBuilderConstants.MATLAB_TEST_RUNNER_FILE_PREFIX
264264
+ scriptPath.getBaseName().replaceAll("-", "_");
265-
final String runCommand = "addpath(genpath('" + scriptPath.getRemote() + "')); "
266-
+ matlabFunctionName + "(" + inputArguments + ")";
265+
final String runCommand = "addpath('" + scriptPath.getRemote().replaceAll("'", "''")
266+
+ "'); " + matlabFunctionName + "(" + inputArguments + ")";
267267
return runCommand;
268268
}
269269

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void verifyMATLABlaunchedWithDefaultArgumentsBatch() throws Exception {
141141
FreeStyleBuild build = project.scheduleBuild2(0).get();
142142
jenkins.assertLogContains("run_matlab_command", build);
143143
jenkins.assertLogContains("test_runner", build);
144-
jenkins.assertLogContains("addpath(genpath", build);
144+
jenkins.assertLogContains("addpath(", build);
145145
}
146146

147147
/*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void verifyCmdOptions() throws Exception {
8787
project.setDefinition(new CpsFlowDefinition(
8888
"node {runMATLABTests(testResultsPDF:'myresult/result.pdf')}", true));
8989
WorkflowRun build = project.scheduleBuild2(0).get();
90-
j.assertLogContains("addpath(genpath", build);
90+
j.assertLogContains("addpath(", build);
9191
j.assertLogContains("test_runner", build);
9292
}
9393

0 commit comments

Comments
 (0)