You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2017/01/31 17:20:37 UTC
lucene-solr:master: SOLR-10024: If you use
ExternalPaths#determineSourceHome with a custom tests.workDir,
tests may not find the path.
Repository: lucene-solr
Updated Branches:
refs/heads/master 72eaeab71 -> 98a5a8137
SOLR-10024: If you use ExternalPaths#determineSourceHome with a custom tests.workDir, tests may not find the path.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/98a5a813
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/98a5a813
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/98a5a813
Branch: refs/heads/master
Commit: 98a5a8137826c73a72fef1d198c775d72310176f
Parents: 72eaeab
Author: markrmiller <ma...@apache.org>
Authored: Mon Jan 23 00:22:39 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Tue Jan 31 12:08:47 2017 -0500
----------------------------------------------------------------------
lucene/common-build.xml | 2 ++
.../src/java/org/apache/solr/util/ExternalPaths.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/98a5a813/lucene/common-build.xml
----------------------------------------------------------------------
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 44d7353..c171386 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1060,6 +1060,8 @@
<!-- turn jenkins blood red for hashmap bugs, even on jdk7 -->
<sysproperty key="jdk.map.althashing.threshold" value="0"/>
+ <sysproperty key="tests.src.home" value="${user.dir}" />
+
<!-- Only pass these to the test JVMs if defined in ANT. -->
<syspropertyset>
<propertyref prefix="tests.maxfailures" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/98a5a813/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java b/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
index 3e91d81..e5a83ef 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
@@ -63,7 +63,7 @@ public class ExternalPaths {
}
} catch (Exception e) {
// If there is no "solr/conf" in the classpath, fall back to searching from the current directory.
- file = new File(".");
+ file = new File(System.getProperty("tests.src.home", "."));
}
File base = file.getAbsoluteFile();
while (!(new File(base, "solr/CHANGES.txt").exists()) && null != base) {