Tweak our test & runner so XPath tests can be executed on Hudson.
diff --git a/libcore/tools/runner/java/dalvik/runner/JUnitFinder.java b/libcore/tools/runner/java/dalvik/runner/JUnitFinder.java
index ba80ac1..e620607 100644
--- a/libcore/tools/runner/java/dalvik/runner/JUnitFinder.java
+++ b/libcore/tools/runner/java/dalvik/runner/JUnitFinder.java
@@ -24,7 +24,9 @@
class JUnitFinder extends NamingPatternCodeFinder {
@Override protected boolean matches(File file) {
- return super.matches(file) && file.getName().endsWith("Test.java");
+ String filename = file.getName();
+ return super.matches(file)
+ && (filename.endsWith("Test.java") || filename.endsWith("TestSuite.java"));
}
// TODO: try to get names for each method?
diff --git a/libcore/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java b/libcore/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java
index 0c24fac..17f0341 100644
--- a/libcore/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java
+++ b/libcore/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java
@@ -53,11 +53,11 @@
*/
public class JaxenXPathTestSuite {
- private static final File DEFAULT_JAXEN_HOME
- = new File("/home/dalvik-prebuild/jaxen");
+ private static final String DEFAULT_JAXEN_HOME = "/home/dalvik-prebuild/jaxen";
public static Test suite() throws Exception {
- return suite(DEFAULT_JAXEN_HOME);
+ String jaxenHome = System.getProperty("jaxen.home", DEFAULT_JAXEN_HOME);
+ return suite(new File(jaxenHome));
}
/**
