Skip to content

Commit 84968a5

Browse files
Add the outputDirectory CLI option.
1 parent dbce0f2 commit 84968a5

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

plugin/src/main/java/org/owasp/benchmarkutils/tools/BenchmarkCrawlerVerification.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ public class BenchmarkCrawlerVerification extends BenchmarkCrawler {
6868
private static boolean isTimingEnabled = false;
6969
// private boolean verifyFixed = false; // DEBUG
7070
private String configurationDirectory = Utils.DATA_DIR;
71-
private String outputDirectory = Utils.DATA_DIR;
72-
// private String beforeFixOutputDirectory =
73-
// new File(new File(Utils.DATA_DIR).getParent(), "before_data")
74-
// .getAbsolutePath(); // DEBUG: Utils.DATA_DIR;
71+
private String defaultOutputDirectory = Utils.DATA_DIR;
72+
private String defaultBeforeFixOutputDirectory =
73+
new File(new File(Utils.DATA_DIR).getParent(), "before_data")
74+
.getAbsolutePath(); // DEBUG: Utils.DATA_DIR;
7575
private static final String FILENAME_TIMES_ALL = "crawlerTimes.txt";
7676
private static final String FILENAME_TIMES = "crawlerSlowTimes.txt";
7777
private static final String FILENAME_NON_DISCRIMINATORY_LOG = "nonDiscriminatoryTestCases.txt";
@@ -97,6 +97,9 @@ public class BenchmarkCrawlerVerification extends BenchmarkCrawler {
9797
@Parameter(property = "beforeFixOutputDirectory")
9898
private String beforeFixOutputDirectory;
9999

100+
@Parameter(property = "outputDirectory")
101+
private String outputDirectory;
102+
100103
@Parameter(property = "testCaseName")
101104
private String selectedTestCaseName;
102105

@@ -681,9 +684,13 @@ protected void processCommandLineArgs(String[] args) {
681684

682685
if (line.hasOption("b")) {
683686
beforeFixOutputDirectory = line.getOptionValue("b");
687+
} else {
688+
beforeFixOutputDirectory = defaultBeforeFixOutputDirectory;
684689
}
685690
if (line.hasOption("d")) {
686691
outputDirectory = line.getOptionValue("d");
692+
} else {
693+
outputDirectory = defaultOutputDirectory;
687694
}
688695
if (line.hasOption("f")) {
689696
this.crawlerFile = line.getOptionValue("f");
@@ -732,6 +739,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
732739
List<String> mainArgs = new ArrayList<>();
733740
mainArgs.add("-f");
734741
mainArgs.add(this.pluginFilenameParam);
742+
if (this.outputDirectory != null) {
743+
mainArgs.add("-d");
744+
mainArgs.add(this.outputDirectory);
745+
}
735746
if (this.beforeFixOutputDirectory != null) {
736747
mainArgs.add("-b");
737748
mainArgs.add(this.beforeFixOutputDirectory);

0 commit comments

Comments
 (0)