Skip to content

Commit 5a8a61d

Browse files
authored
Merge pull request #15513 from dwijnand/ci/drop-dist/pack
2 parents 327ecc2 + 764c9b7 commit 5a8a61d

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

.github/workflows/ci.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,13 @@ jobs:
7171
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
7272

7373
- name: Test
74+
# DON'T add dist/pack!
75+
# Adding dist/pack bootstraps the compiler
76+
# which undermines the point of these tests:
77+
# to quickly run the tests without the cost of bootstrapping
78+
# and also to run tests when the compiler doesn't bootstrap
7479
run: |
75-
./project/scripts/sbt ";dist/pack; compile ;test"
80+
./project/scripts/sbt ";compile ;test"
7681
./project/scripts/cmdTests
7782
7883
test:

compiler/test/dotty/tools/scripting/BashScriptsTests.scala

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import scala.language.unsafeNulls
77
import java.nio.file.Paths
88
import org.junit.{Test, AfterClass}
99
import org.junit.Assert.assertEquals
10+
import org.junit.experimental.categories.Category
1011

1112
import vulpix.TestConfiguration
1213

@@ -156,6 +157,7 @@ class BashScriptsTests:
156157
* verify that scriptPath.sc sees a valid script.path property,
157158
* and that it's value is the path to "scriptPath.sc".
158159
*/
160+
@Category(Array(classOf[BootstrappedOnlyTests]))
159161
@Test def verifyScriptPathProperty =
160162
val scriptFile = testFiles.find(_.getName == "scriptPath.sc").get
161163
val expected = s"${scriptFile.getName}"

compiler/test/dotty/tools/scripting/ExpressionTest.scala

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import scala.language.unsafeNulls
77
import java.nio.file.Paths
88
import org.junit.{Test, AfterClass}
99
import org.junit.Assert.assertEquals
10+
import org.junit.experimental.categories.Category
1011

1112
import vulpix.TestConfiguration
1213

@@ -15,6 +16,7 @@ import ScriptTestEnv.*
1516
/**
1617
* +. test scala -e <expression>
1718
*/
19+
@Category(Array(classOf[BootstrappedOnlyTests]))
1820
class ExpressionTest:
1921
/*
2022
* verify -e <expression> works.

0 commit comments

Comments
 (0)