Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Fix StatusTool related issues on Windows (#2798)

Christos Malliaridis290dba64cd16
diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy
index 0a7fea95ad6..8183cf1e1e7 100644
--- a/gradle/testing/randomization/policies/solr-tests.policy
+++ b/gradle/testing/randomization/policies/solr-tests.policy
@@ -255,7 +255,8 @@ grant {
// Run java
permission java.io.FilePermission "${java.home}${/}-", "execute";
- permission java.io.FilePermission "C:\\Windows\\*\\wmic.exe", "execute";
+ // Required by SolrProcessManager on Windows to find Solr processes, used by StatusTool (CLI)
+ permission java.io.FilePermission "<<ALL FILES>>", "execute";
};
// Grant all permissions to Gradle test runner classes.
diff --git a/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java b/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java
index 2bb49ef73ad..dca7e685a46 100644
--- a/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/SolrProcessManagerTest.java
@@ -85,7 +85,7 @@ public class SolrProcessManagerTest extends SolrTestCase {
// Get the path to the java executable from the current JVM
String classPath =
Arrays.stream(System.getProperty("java.class.path").split(File.pathSeparator))
- .filter(p -> p.contains("solr/core/build"))
+ .filter(p -> p.contains("solr") && p.contains("core") && p.contains("build"))
.collect(Collectors.joining(File.pathSeparator));
ProcessBuilder processBuilder =
new ProcessBuilder(