diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-01 02:12:36 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-01 10:10:19 -0800 |
| commit | ffce2f26e02997546511e258f45f1a4554a882ca (patch) | |
| tree | 36c0df1a902020216c66be110a8778aeb3ae353a /scalalib/src | |
| parent | cb5e3291155ba0d29c1a530d6c217d22a3a743f4 (diff) | |
| download | mill-ffce2f26e02997546511e258f45f1a4554a882ca.tar.gz mill-ffce2f26e02997546511e258f45f1a4554a882ca.tar.bz2 mill-ffce2f26e02997546511e258f45f1a4554a882ca.zip | |
Properly handle `isModule` flag on `sbt.testing.FingerPrint`
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/TestRunner.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala index 7fd6079e..b734273f 100644 --- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala +++ b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala @@ -30,8 +30,11 @@ object TestRunner { val cls = cl.loadClass(path.stripSuffix(".class").replace('/', '.')) fingerprints.find { case f: SubclassFingerprint => + + (f.isModule == cls.getName.endsWith("$")) && cl.loadClass(f.superclassName()).isAssignableFrom(cls) case f: AnnotatedFingerprint => + (f.isModule == cls.getName.endsWith("$")) && cls.isAnnotationPresent( cl.loadClass(f.annotationName()).asInstanceOf[Class[Annotation]] ) |