diff --git a/.travis.yml b/.travis.yml index fb19d6777..b8a3a0abd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: java before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" + - "git clone https://github.com/secure-software-engineering/DroidBench.git" + - "export DROID_BENCH_ROOT=`pwd`/DroidBench" install: mvn clean verify -DskipTests=true -B -q script: mvn clean verify -B -q sudo: false diff --git a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java index bc63826e2..3f6b905f3 100644 --- a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java +++ b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java @@ -75,7 +75,15 @@ public class DroidBenchCGTest extends DalvikCallGraphTestBase { uncalledFunctions.put("Reflection_Reflection1.apk", x); } - public static final String droidBenchRoot = walaProperties.getProperty("droidbench.root"); + public static String droidBenchRoot; + + { + String f = walaProperties.getProperty("droidbench.root"); + if (f == null || !new File(f).exists()) { + f = System.getenv("DROID_BENCH_ROOT"); + } + droidBenchRoot = f; + } private void assertUserCodeReachable(CallGraph cg) throws InvalidClassFileException { for(Iterator clss = cg.getClassHierarchy().getLoader(ClassLoaderReference.Application).iterateAllClasses();