From 0500d237f9e6128bf0b2ef5ec8efff70afc59d70 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Tue, 26 Dec 2017 17:00:54 -0600 Subject: [PATCH] Add various test resource directories Unfortunately these tests are still not finding their resources properly at test run time. I don't know why. It seems to have something to do with how the tests instantiate and use class loaders. I'm probably going to need expert help with this. --- com.ibm.wala.cast.js.rhino.test/build.gradle | 7 ++++++- com.ibm.wala.dalvik.test/build.gradle | 5 ++++- com.ibm.wala.ide.jdt.test/build.gradle | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle index b9f43c466..d7c1e51e7 100644 --- a/com.ibm.wala.cast.js.rhino.test/build.gradle +++ b/com.ibm.wala.cast.js.rhino.test/build.gradle @@ -2,7 +2,10 @@ plugins { id 'com.github.hauner.jarTest' version '1.0.1' } -sourceSets.test.java.srcDirs = ['harness-src'] +sourceSets.test { + java.srcDirs = ['harness-src'] + resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')] +} dependencies { testCompile 'junit:junit:4.11' @@ -16,3 +19,5 @@ dependencies { testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.test') testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests') } + +test.environment 'TRAVIS', 1 diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index 3987a4526..11d6c243f 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -1,6 +1,9 @@ sourceSets.test { java.srcDirs = ['source'] - resources.srcDirs = ['data'] + resources.srcDirs = [ + 'data', + project(':com.ibm.wala.core.testdata').tasks.compileTestJava, + ] } dependencies { diff --git a/com.ibm.wala.ide.jdt.test/build.gradle b/com.ibm.wala.ide.jdt.test/build.gradle index 23d64eba6..3b4cf0821 100644 --- a/com.ibm.wala.ide.jdt.test/build.gradle +++ b/com.ibm.wala.ide.jdt.test/build.gradle @@ -1,6 +1,9 @@ sourceSets.test { java.srcDirs = ['source'] - resources.srcDirs = ['testdata'] + resources.srcDirs = [ + 'testdata', + project(':com.ibm.wala.cast.java.test.data').sourceSets.test.java, + ] } dependencies {