diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-06-19 16:31:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-19 16:31:47 -0400 |
commit | bb856040475cc15fe0754a52428375bd36f8b782 (patch) | |
tree | 3fe563f8596b49a136e12dfd693f7b21c0afc90d /stage2/Lib.scala | |
parent | 9596983505f1e0d2e4c582e1c23f04e35b42fde1 (diff) | |
parent | 32691b7908150970344a5c3a5c58fef9dec0a6ac (diff) | |
download | cbt-bb856040475cc15fe0754a52428375bd36f8b782.tar.gz cbt-bb856040475cc15fe0754a52428375bd36f8b782.tar.bz2 cbt-bb856040475cc15fe0754a52428375bd36f8b782.zip |
Merge pull request #150 from cvogt/chris2
various changes
Diffstat (limited to 'stage2/Lib.scala')
-rw-r--r-- | stage2/Lib.scala | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/stage2/Lib.scala b/stage2/Lib.scala index 2430c1d..c08657f 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -107,26 +107,6 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ } } - def test( context: Context ): Option[ExitCode] = { - if((context.projectDirectory ++ "/test").exists){ - val loggers = logger.enabledLoggers.mkString(",") - // FIXME: this is a hack to pass logger args on to the tests. - // should probably have a more structured way - val loggerArg = if(loggers != "") Some("-Dlog="++loggers) else None - - logger.lib(s"invoke testDefault( $context )") - val exitCode: ExitCode = - new ReflectBuild( - loadDynamic( - context.copy( projectDirectory = context.projectDirectory ++ "/test", args = loggerArg.toVector ++ context.args ), - new BasicBuild(_) with mixins.Test - ) - ).callNullary( Some("run") ) - logger.lib(s"return testDefault( $context )") - Some(exitCode) - } else None - } - // task reflection helpers def tasks(cls:Class[_]): Map[String, Method] = Stream @@ -153,8 +133,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ val baseTasks = Seq( classOf[BasicBuild], classOf[PackageJars], - classOf[Publish], - classOf[Recommended] + classOf[Publish] ).flatMap(lib.taskNames).distinct.sorted val thisTasks = lib.taskNames(buildClass) diff baseTasks ( |