From 4064765830603491ba28aa3a94ca47d3d3daa26f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 7 Feb 2022 17:26:43 +0100 Subject: [PATCH] Re-enable missing cmdTests It might have been disabled by mistake because bootstrapCmdTests was assumed to be the set of tests for the bootstrapped compiler. The second is an extension for the second with tests that can only be run on the bootstrapped compiler. It is now renamed to bootstrappedOnlyCmdTests to make sure we avoid this potential confusion. --- .github/workflows/ci.yaml | 6 ++++-- .../scripts/{bootstrapCmdTests => bootstrappedOnlyCmdTests} | 0 tests/pos/i12973.scala | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename project/scripts/{bootstrapCmdTests => bootstrappedOnlyCmdTests} (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2847bfd578b9..d9da3baee124 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -112,7 +112,8 @@ jobs: - name: Cmd Tests run: | ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test" - ./project/scripts/bootstrapCmdTests + ./project/scripts/cmdTests + ./project/scripts/bootstrappedOnlyCmdTests - name: MiMa run: | @@ -447,7 +448,8 @@ jobs: - name: Test run: | ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test" - ./project/scripts/bootstrapCmdTests + ./project/scripts/cmdTests + ./project/scripts/bootstrappedOnlyCmdTests publish_nightly: runs-on: [self-hosted, Linux] diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrappedOnlyCmdTests similarity index 100% rename from project/scripts/bootstrapCmdTests rename to project/scripts/bootstrappedOnlyCmdTests diff --git a/tests/pos/i12973.scala b/tests/pos/i12973.scala index 9cda7dbc120b..53c6476d798e 100644 --- a/tests/pos/i12973.scala +++ b/tests/pos/i12973.scala @@ -1,4 +1,4 @@ -// Compiled and placed on the REPL classpath in the bootstrapCmdTests script +// Compiled and placed on the REPL classpath in the bootstrappedOnlyCmdTests script // to test that launching the REPL with `scala -cp ` works (issue #12973) case class Bug12973(): def check = s"$productPrefix is fixed"