From a1dd332d4e73177334627f4819473d89b42a7be1 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 22 Nov 2018 14:23:50 +0100 Subject: [PATCH] Move remaining sbt-coursier specific tests --- .../dependency-graph/build.sbt | 0 .../dependency-graph/project/plugins.sbt | 0 .../dependency-graph/src/main/scala/Main.scala | 0 .../dependency-graph/test | 0 .../dependency-graph/whatDependsOnResult.log | 0 .../in-memory-cache/build.sbt | 0 .../in-memory-cache/project/plugins.sbt | 0 .../in-memory-cache/test | 0 scripts/travis.sh | 8 +++++++- 9 files changed, 7 insertions(+), 1 deletion(-) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/dependency-graph/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/dependency-graph/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/dependency-graph/src/main/scala/Main.scala (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/dependency-graph/test (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/dependency-graph/whatDependsOnResult.log (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/in-memory-cache/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/in-memory-cache/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => sbt-coursier}/in-memory-cache/test (100%) diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/whatDependsOnResult.log b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/whatDependsOnResult.log rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test diff --git a/scripts/travis.sh b/scripts/travis.sh index 910cd9ebe..b45bd8a02 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -27,10 +27,16 @@ runLmCoursierTests() { } runSbtCoursierTests() { + if [ "$TEST_GROUP" = 1 ]; then + SCRIPTED_EXTRA="sbt-coursier/*" + else + SCRIPTED_EXTRA="" + fi + ./metadata/scripts/with-test-repo.sh sbt \ ++$TRAVIS_SCALA_VERSION \ sbt-coursier-shared/test \ - "sbt-coursier/scripted shared-$TEST_GROUP/* sbt-coursier-group-$TEST_GROUP/*" + "sbt-coursier/scripted shared-$TEST_GROUP/* $SCRIPTED_EXTRA" } runSbtShadingTests() {