Skip to content

Commit 32674ef

Browse files
committed
Clarify reproduce info on Windows
This commit correct the test failure reproduction line on Windows. Relates #28104
1 parent d4f18c8 commit 32674ef

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
package org.elasticsearch.gradle.vagrant
22

3+
import org.apache.tools.ant.taskdefs.condition.Os
34
import org.elasticsearch.gradle.FileContentsTask
4-
import org.gradle.api.*
5+
import org.gradle.api.GradleException
6+
import org.gradle.api.InvalidUserDataException
7+
import org.gradle.api.Plugin
8+
import org.gradle.api.Project
9+
import org.gradle.api.Task
510
import org.gradle.api.artifacts.dsl.RepositoryHandler
611
import org.gradle.api.execution.TaskExecutionAdapter
712
import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency
@@ -356,8 +361,9 @@ class VagrantTestPlugin implements Plugin<Project> {
356361
TaskExecutionAdapter packagingReproListener = new TaskExecutionAdapter() {
357362
@Override
358363
void afterExecute(Task task, TaskState state) {
364+
final String gradlew = Os.isFamily(Os.FAMILY_WINDOWS) ? "gradlew" : "./gradlew"
359365
if (state.failure != null) {
360-
println "REPRODUCE WITH: ./gradlew ${packaging.path} " +
366+
println "REPRODUCE WITH: ${gradlew} ${packaging.path} " +
361367
"-Dtests.seed=${project.extensions.esvagrant.formattedTestSeed} "
362368
}
363369
}

test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import com.carrotsearch.randomizedtesting.ReproduceErrorMessageBuilder;
2222
import org.apache.logging.log4j.Logger;
23+
import org.apache.lucene.util.Constants;
2324
import org.elasticsearch.common.Strings;
2425
import org.elasticsearch.common.logging.Loggers;
2526
import org.elasticsearch.test.ESIntegTestCase;
@@ -72,7 +73,8 @@ public void testFailure(Failure failure) throws Exception {
7273
return;
7374
}
7475

75-
final StringBuilder b = new StringBuilder("REPRODUCE WITH: ./gradlew ");
76+
final String gradlew = Constants.WINDOWS ? "gradlew" : "./gradlew";
77+
final StringBuilder b = new StringBuilder("REPRODUCE WITH: " + gradlew + " ");
7678
String task = System.getProperty("tests.task");
7779
// TODO: enforce (intellij still runs the runner?) or use default "test" but that won't work for integ
7880
b.append(task);

0 commit comments

Comments
 (0)