Skip to content

Commit

Permalink
Remove calling with option -cdr (#109)
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
  • Loading branch information
richiware committed Mar 13, 2024
1 parent 3f7caf6 commit 56380da
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
6 changes: 2 additions & 4 deletions src/it/java/com/eprosima/integration/Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@ public boolean generate(
String generatorName,
String inputPath,
String exampleArch,
String cdr_version,
boolean testFlag)
{
String program = "java -jar " + generatorName + ".jar";
String flags = " -cdr " + cdr_version + " -replace -example" + " " + exampleArch + (testFlag ? " -test" : "");
String flags = " -replace -example" + " " + exampleArch + (testFlag ? " -test" : "");
String output = " -d " + outputPath;

String idlPath = " " + inputPath + "/" + idl + ".idl";
Expand All @@ -63,11 +62,10 @@ public boolean generate(
public boolean generate(
String generatorName,
String inputPath,
String cdr_version,
boolean testFlag)
{
String program = "java -jar " + generatorName + ".jar";
String flags = " -cdr " + cdr_version + " -replace -example" + (testFlag ? " -test" : "");
String flags = " -replace -example" + (testFlag ? " -test" : "");
String output = " -d " + outputPath;

String idlPath = " " + inputPath + "/" + idl + ".idl";
Expand Down
9 changes: 2 additions & 7 deletions src/it/java/com/eprosima/integration/TestManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@ public int getValue()
private String exampleArch;
private List<String> cMakeArgs;
private boolean errorOutputOnly;
private String cdr_version_;

public TestManager(
TestLevel level,
String generatorName,
String inputPath,
String outputPath,
String cdr_version,
List<String> list_tests,
List<String> blacklist_tests)
{
Expand All @@ -59,7 +57,6 @@ public TestManager(
this.exampleArch = null;
this.cMakeArgs = new ArrayList<String>();
this.errorOutputOnly = true;
this.cdr_version_ = cdr_version;
}

public TestManager(
Expand All @@ -68,7 +65,6 @@ public TestManager(
String inputPath,
String outputPath,
String exampleArch,
String cdr_version,
List<String> list_tests,
List<String> blacklist_tests)
{
Expand All @@ -81,7 +77,6 @@ public TestManager(
this.exampleArch = exampleArch;
this.cMakeArgs = new ArrayList<String>();
this.errorOutputOnly = true;
this.cdr_version_ = cdr_version;
}

public void processIDLsDirectory(
Expand Down Expand Up @@ -164,9 +159,9 @@ public boolean generate(Test test)

if (exampleArch == null)
{
return printlnStatus(test.generate(generatorName, inputPath, cdr_version_, level == TestLevel.RUN));
return printlnStatus(test.generate(generatorName, inputPath, level == TestLevel.RUN));
} else {
return printlnStatus(test.generate(generatorName, inputPath, exampleArch, cdr_version_, level == TestLevel.RUN));
return printlnStatus(test.generate(generatorName, inputPath, exampleArch, level == TestLevel.RUN));
}
}

Expand Down

0 comments on commit 56380da

Please sign in to comment.