aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-testrunner-components
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-08-14 17:19:04 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-08-14 17:19:04 +0200
commit9b562a3489fba79bd0faf776687291088815621d (patch)
treef0f5f61737ee0d9f237d782e47f8cc788af987c5 /vespa-testrunner-components
parent6ea9324d3dd790ae3ef389ed2d34d33837ba6a80 (diff)
Add custom path to PATH to run mvn?
Diffstat (limited to 'vespa-testrunner-components')
-rw-r--r--vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java1
-rw-r--r--vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerTest.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
index a14c1e2a231..e97956b71d5 100644
--- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
+++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
@@ -102,6 +102,7 @@ public class TestRunner {
ProcessBuilder builder = new ProcessBuilder(command);
builder.environment().merge("MAVEN_OPTS", " -Djansi.force=true", String::concat);
+ builder.environment().merge("PATH", ":" + vespaHome.resolve("local/maven/bin/"), String::concat);
builder.directory(vespaHome.resolve("tmp/test").toFile());
builder.redirectErrorStream(true);
return builder;
diff --git a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerTest.java b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerTest.java
index 49c95fa4b6f..e8fc589b972 100644
--- a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerTest.java
+++ b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/TestRunnerTest.java
@@ -15,7 +15,6 @@ import java.util.logging.LogRecord;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
/**
* Unit tests relying on a UNIX shell >_<