From e738bc3f7314782dc5e09a2c5f76e9496bd1d8be Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Fri, 8 Jan 2016 21:53:53 +0100 Subject: [PATCH] Run unit tests from compileInterface on Travis CI. Also, make the intent of the env variable clearer in travis configuration. Fixes #2357. --- .travis.yml | 46 +++++++++++++++++++++++----------------------- build.sbt | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff140215d..534bb80ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,28 +15,28 @@ jdk: env: matrix: - - SCRIPTED_TEST="safeUnitTests" - - SCRIPTED_TEST="otherUnitTests" - - SCRIPTED_TEST="scripted actions/*" - - SCRIPTED_TEST="scripted api/*" - - SCRIPTED_TEST="scripted compiler-project/*" - - SCRIPTED_TEST="scripted dependency-management/*1of2" - - SCRIPTED_TEST="scripted dependency-management/*2of2" - - SCRIPTED_TEST="scripted ivy-deps-management/*" - - SCRIPTED_TEST="scripted java/*" - - SCRIPTED_TEST="scripted package/*" - - SCRIPTED_TEST="scripted project/*1of2" - - SCRIPTED_TEST="scripted project/*2of2" - - SCRIPTED_TEST="scripted reporter/*" - - SCRIPTED_TEST="scripted run/*" - - SCRIPTED_TEST="scripted source-dependencies/*1of3" - - SCRIPTED_TEST="scripted source-dependencies/*2of3" - - SCRIPTED_TEST="scripted source-dependencies/*3of3" - - SCRIPTED_TEST="scripted tests/*" - - SCRIPTED_TEST="scripted project-load/*" - - SCRIPTED_TEST="checkBuildScala211" - - SCRIPTED_TEST="mavenResolverPluginTest:scripted dependency-management/*1of2 project/transitive-plugins" - - SCRIPTED_TEST="mavenResolverPluginTest:scripted dependency-management/*2of2" + - SBT_CMD="safeUnitTests" + - SBT_CMD="otherUnitTests" + - SBT_CMD="scripted actions/*" + - SBT_CMD="scripted api/*" + - SBT_CMD="scripted compiler-project/*" + - SBT_CMD="scripted dependency-management/*1of2" + - SBT_CMD="scripted dependency-management/*2of2" + - SBT_CMD="scripted ivy-deps-management/*" + - SBT_CMD="scripted java/*" + - SBT_CMD="scripted package/*" + - SBT_CMD="scripted project/*1of2" + - SBT_CMD="scripted project/*2of2" + - SBT_CMD="scripted reporter/*" + - SBT_CMD="scripted run/*" + - SBT_CMD="scripted source-dependencies/*1of3" + - SBT_CMD="scripted source-dependencies/*2of3" + - SBT_CMD="scripted source-dependencies/*3of3" + - SBT_CMD="scripted tests/*" + - SBT_CMD="scripted project-load/*" + - SBT_CMD="checkBuildScala211" + - SBT_CMD="mavenResolverPluginTest:scripted dependency-management/*1of2 project/transitive-plugins" + - SBT_CMD="mavenResolverPluginTest:scripted dependency-management/*2of2" notifications: email: @@ -44,7 +44,7 @@ notifications: - joshua.suereth@typesafe.com script: - - sbt -J-XX:ReservedCodeCacheSize=128m "$SCRIPTED_TEST" + - sbt -J-XX:ReservedCodeCacheSize=128m "$SBT_CMD" # Tricks to avoid unnecessary cache updates - find $HOME/.sbt -name "*.lock" | xargs rm diff --git a/build.sbt b/build.sbt index 509f95495..c1682d13e 100644 --- a/build.sbt +++ b/build.sbt @@ -519,7 +519,7 @@ lazy val safeUnitTests = taskKey[Unit]("Known working tests (for both 2.10 and 2 lazy val safeProjects: ScopeFilter = ScopeFilter( inProjects(mainSettingsProj, mainProj, ivyProj, completeProj, actionsProj, classpathProj, collectionProj, compileIncrementalProj, - logProj, runProj, stdTaskProj, compilerProj), + logProj, runProj, stdTaskProj, compilerProj, compileInterfaceProj), inConfigurations(Test) ) lazy val otherUnitTests = taskKey[Unit]("Unit test other projects")