resolve #2633

karatelabs · Jan 3, 2025 · 28ce176 · 28ce176
1 parent 849b05a
commit 28ce176
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/karate-core/src/main/java/com/intuit/karate/Main.java b/karate-core/src/main/java/com/intuit/karate/Main.java
@@ -94,7 +94,7 @@ public class Main implements Callable<Void> {
     @Option(names = {"-T", "--threads"}, description = "number of threads when running tests")
     int threads;
 
-    @Option(names = {"-o", "--output"}, description = "directory where logs and reports are output (default 'target')")
+    @Option(names = {"-o", "--output"}, description = "directory where logs and report sub-folders are output (default 'target')")
     String output = FileUtils.getBuildDir();
 
     @Option(names = {"-f", "--format"}, split = ",", description = "comma separate report output formats. tilde excludes the output report. html report is included by default unless it's negated."
@@ -113,6 +113,9 @@ public class Main implements Callable<Void> {
     @Option(names = {"-g", "--configdir"}, description = "directory where 'karate-config.js' is expected (default 'classpath:' or <workingdir>)")
     String configDir;
 
+    @Option(names = {"-r", "--reportdir"}, description = "directory where Karate HTML and JSON reports are placed (default '<output>/karate-reports')")
+    String reportDir;
+
     @Option(names = {"-C", "--clean"}, description = "clean output directory")
     boolean clean;
 
@@ -194,6 +197,10 @@ public void setConfigDir(String configDir) {
         this.configDir = configDir;
     }
 
+    public String getReportDir() {
+        return reportDir;
+    }
+
     public static Main parseKarateOptions(String line) {
         String[] args = Command.tokenize(line);
         return CommandLine.populateCommand(new Main(), args);
@@ -328,6 +335,7 @@ public Void call() throws Exception {
                     .buildDir(output)
                     .backupReportDir(backupReportDir)
                     .configDir(configDir)
+                    .reportDir(reportDir)
                     .outputHtmlReport(isOutputHtmlReport())
                     .outputCucumberJson(isOutputCucumberJson())
                     .outputJunitXml(isOutputJunitXml())

diff --git a/karate-core/src/main/java/com/intuit/karate/Runner.java b/karate-core/src/main/java/com/intuit/karate/Runner.java
@@ -173,6 +173,9 @@ public List<FeatureCall> resolveAll() {
             if (tempOptions != null) {
                 LOGGER.info("using system property '{}': {}", Constants.KARATE_OPTIONS, tempOptions);
                 Main ko = Main.parseKarateOptions(tempOptions);
+                if (ko.reportDir != null) {
+                    reportDir = ko.reportDir;
+                }
                 if (ko.tags != null) {
                     tags = ko.tags;
                 }
@@ -483,6 +486,10 @@ private String[] getDebugArgs(int debugPort) {
             List<String> args = new ArrayList();
             args.add("-d");
             args.add(debugPort + "");
+            if (reportDir != null) {
+                args.add("-r");
+                args.add(reportDir);
+            }
             if (env != null) {
                 args.add("-e");
                 args.add(env);