diff --git a/bench/scripts/collection-strawman-cold.sh b/bench/scripts/collection-strawman-cold.sh index a58783d37a19..0f96cb807cd1 100755 --- a/bench/scripts/collection-strawman-cold.sh +++ b/bench/scripts/collection-strawman-cold.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find collection-strawman/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt +find collection-strawman/collections/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt diff --git a/bench/scripts/collection-strawman.sh b/bench/scripts/collection-strawman.sh index a7e6f5bbe2e2..df33a8ce3598 100755 --- a/bench/scripts/collection-strawman.sh +++ b/bench/scripts/collection-strawman.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find collection-strawman/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run" {} + | sbt +find collection-strawman/collections/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run" {} + | sbt diff --git a/collection-strawman b/collection-strawman index 052a7d26ff33..abd20a60f730 160000 --- a/collection-strawman +++ b/collection-strawman @@ -1 +1 @@ -Subproject commit 052a7d26ff337824fb865d6c59eecf3dfe174bb6 +Subproject commit abd20a60f730ef478551ee68ed4326f8bf582dd8 diff --git a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala index 706c80d32524..5515e005b564 100644 --- a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala +++ b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala @@ -32,7 +32,7 @@ class IdempotencyTests extends ParallelTesting { def sourcesFrom(dir: Path) = CompilationTests.sources(Files.walk(dir)) - val strawmanSources = sourcesFrom(Paths.get("../collection-strawman/src/main")) + val strawmanSources = sourcesFrom(Paths.get("../collection-strawman/collections/src/main")) val strawmanSourcesSorted = strawmanSources.sorted val strawmanSourcesRevSorted = strawmanSourcesSorted.reverse diff --git a/compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala b/compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala index 7aa2f0bcb651..f01582eaf32b 100644 --- a/compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala +++ b/compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala @@ -29,7 +29,7 @@ class LinkOptimiseTests extends ParallelTesting { @Test def linkOptimise: Unit = { // Setup and compile libraries def strawmanLibrary = - compileDir("../collection-strawman/src/main", defaultOptions) + compileDir("../collection-strawman/collections/src/main", defaultOptions) def linkCustomLib = compileDir("../tests/link/custom-lib", defaultOptions)