Apply default outputDir indexing logic to user-provided output dir

gradle · Dec 21, 2022 · 841c737 · 841c737
1 parent 8ec14c6
commit 841c737
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/gradle/profiler/CommandLineParser.java b/src/main/java/org/gradle/profiler/CommandLineParser.java
@@ -47,8 +47,7 @@ public InvocationSettings parseSettings(String[] args) throws IOException, Setti
         OptionSpecBuilder disableStudioSandbox = parser.accepts("no-studio-sandbox", "Marks that Android Studio should not use sandbox");
         ArgumentAcceptingOptionSpec<File> scenarioFileOption = parser.accepts("scenario-file", "Scenario definition file to use").withRequiredArg().ofType(File.class);
         ArgumentAcceptingOptionSpec<String> sysPropOption = parser.accepts("D", "Defines a system property").withRequiredArg();
-        ArgumentAcceptingOptionSpec<File> outputDirOption = parser.accepts("output-dir", "Directory to write results to").withRequiredArg()
-            .ofType(File.class).defaultsTo(findOutputDir("profile-out"));
+        ArgumentAcceptingOptionSpec<String> outputDirPathOption = parser.accepts("output-dir", "Directory to write results to").withRequiredArg().defaultsTo("profile-out");
         ArgumentAcceptingOptionSpec<Integer> warmupsOption = parser.accepts("warmups", "Number of warm-up build to run for each scenario").withRequiredArg().ofType(Integer.class);
         ArgumentAcceptingOptionSpec<Integer> iterationsOption = parser.accepts("iterations", "Number of builds to run for each scenario").withRequiredArg().ofType(Integer.class);
         ArgumentAcceptingOptionSpec<String> profilerOption = parser.accepts("profile",
@@ -111,7 +110,8 @@ public InvocationSettings parseSettings(String[] args) throws IOException, Setti
             return fail(parser, "Neither --profile or --benchmark specified.");
         }
 
-        File outputDir = toAbsoluteFileOrNull(parsedOptions.valueOf(outputDirOption));
+        String outputDirPath = parsedOptions.valueOf(outputDirPathOption);
+        File outputDir = toAbsoluteFileOrNull(findOutputDir(outputDirPath));
         File gradleUserHome = toAbsoluteFileOrNull(parsedOptions.valueOf(gradleUserHomeOption));
         Integer warmups = parsedOptions.valueOf(warmupsOption);
         Integer iterations = parsedOptions.valueOf(iterationsOption);