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

Commit 135e56c

Browse files
committed
Address Mark's feedback. Adjust file separators
1 parent fec8204 commit 135e56c

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/main/java/com/mathworks/ci/actions/RunMatlabBuildAction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,14 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
8585

8686
// Handle build result
8787
Run<?,?> build = this.params.getBuild();
88-
FilePath jsonFile = new FilePath(params.getWorkspace(), ".matlab/buildArtifact.json");
88+
FilePath jsonFile = new FilePath(params.getWorkspace(), ".matlab" + File.separator + "buildArtifact.json");
8989
if (jsonFile.exists()) {
9090
FilePath rootLocation = new FilePath(
9191
new File(
9292
build.getRootDir()
9393
.getAbsolutePath()
94-
+ "/buildArtifact.json"));
94+
+ File.separator
95+
+ "buildArtifact.json"));
9596
jsonFile.copyTo(rootLocation);
9697
jsonFile.delete();
9798
build.addAction(new BuildArtifactAction(build, this.params.getWorkspace()));

src/main/java/com/mathworks/ci/actions/RunMatlabTestsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
5454
}
5555

5656
private String singleQuotify(String in) {
57-
return "'" + in + "'";
57+
return "'" + in.replace("'", "''") + "'";
5858
}
5959

6060
// Concatenate the input arguments, try to keep this function as

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public SelectByTag getSelectByTag() {
204204
return this.selectByTag;
205205
}
206206

207-
public String getSelectByTagPath() {
207+
public String getSelectByTagAsString() {
208208
return this.selectByTag == null
209209
? null
210210
: selectByTag.getTestTag();
@@ -381,7 +381,7 @@ public void perform(@Nonnull Run<?, ?> build, @Nonnull FilePath workspace,
381381
this.getCoberturaReportFilePath(),
382382
this.getStmResultsFilePath(),
383383
this.getModelCoverageFilePath(),
384-
this.getSelectByTagPath(),
384+
this.getSelectByTagAsString(),
385385
this.getLoggingLevel(),
386386
this.getOutputDetail(),
387387
this.getUseParallel(),

0 commit comments

Comments
 (0)