From 43c58c7646f9913e9bd95897294575d707830e19 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 15 Sep 2019 14:53:24 +0200 Subject: [PATCH 1/3] Fix sbt scripted test after #7164 --- .../sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala b/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala index 9fb8efa557ab..65d25055c9df 100644 --- a/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala +++ b/sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala @@ -61,7 +61,7 @@ class InitChecker extends PluginPhase { ctx.warning("tree: " + tree.symbol.defTree.show) } else { - ctx.warning(tree.symbol + " is neither in lib nor hello, owner = " + enclosingPkg, tree.sourcePos) + ctx.warning(s"${tree.symbol} is neither in lib nor hello, owner = $enclosingPkg", tree.sourcePos) } tree } @@ -83,4 +83,4 @@ class InitChecker extends PluginPhase { } tree } -} \ No newline at end of file +} From 517cce00c12bb5a634f5b628b9daa7dd17ecc7ae Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 15 Sep 2019 16:10:21 +0200 Subject: [PATCH 2/3] Increase timeout for bootstrapped tests tests/run-staging/quote-toExprOfTuple.scala and tests/run-staging/quote-run-many.scala failed with a timeout on the CI. --- .../dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala index 6f61401559cc..61da70fef499 100644 --- a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala @@ -21,7 +21,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting { // Test suite configuration -------------------------------------------------- - def maxDuration = 30.seconds + def maxDuration = 60.seconds def numberOfSlaves = 5 def safeMode = Properties.testsSafeMode def isInteractive = SummaryReport.isInteractive From b3a7025b1fda72d01271ef722eae71da9974c6b1 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 15 Sep 2019 18:29:45 +0200 Subject: [PATCH 3/3] .drone.yml: Handle changes in submodule remote We need to run "git submodule sync" in case we picked up a submodule remote change when merging master into this branch when running the CI. --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 20ee7f752759..f1ccdace55a9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,6 +49,7 @@ steps: depends_on: [ clone ] commands: - cp -R . /tmp/3/ && cd /tmp/3/ + - git submodule sync - git submodule update --init --recursive --jobs 7 - ./project/scripts/sbt community-build/test