diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 09:07:39 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 13:20:45 -0700 |
commit | 9295d5240a417cd09c33317ab2d2a99a36e50485 (patch) | |
tree | 1fb5b3f2a818517840c42ecd1c0697f091443912 /integration/test/resources | |
parent | 11122c48452d40eb32086fa247ce06d5d6f1a789 (diff) | |
download | mill-9295d5240a417cd09c33317ab2d2a99a36e50485.tar.gz mill-9295d5240a417cd09c33317ab2d2a99a36e50485.tar.bz2 mill-9295d5240a417cd09c33317ab2d2a99a36e50485.zip |
caffeine core and guava tests seem to pass
Diffstat (limited to 'integration/test/resources')
-rw-r--r-- | integration/test/resources/caffeine/build.sc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/integration/test/resources/caffeine/build.sc b/integration/test/resources/caffeine/build.sc index 3c023366..32bf2d1b 100644 --- a/integration/test/resources/caffeine/build.sc +++ b/integration/test/resources/caffeine/build.sc @@ -21,7 +21,7 @@ trait CaffeineModule extends MavenModule{ def testFrameworks = Seq("com.novocode.junit.JUnitFramework") def ivyDeps = Agg( ivy"com.novocode:junit-interface:0.11", - ivy"com.lihaoyi:mill-testng:0.1.7-79-91f790", + ivy"com.lihaoyi:mill-testng:${sys.props("MILL_VERSION")}", libraries.guava, testLibraries.mockito, testLibraries.hamcrest, @@ -85,6 +85,8 @@ object caffeine extends CaffeineModule { testLibraries.guavaTestLib, ) ++ testLibraries.testng + + def allSourceFiles = super.allSourceFiles().filter(_.path.last != "OSGiTest.java") } } @@ -99,6 +101,7 @@ object guava extends CaffeineModule { testLibraries.easymock, testLibraries.guavaTestLib ) + def allSourceFiles = super.allSourceFiles().filter(_.path.last != "OSGiTest.java") def forkArgs = Seq( "-Dguava.osgi.version=" + versions.guava, "-Dcaffeine.osgi.jar=" + caffeine.jar().path, |