From 922d5359aa4ae09eff0a6a3748d7bd88e37d300d Mon Sep 17 00:00:00 2001 From: Greg Littlefield Date: Thu, 10 Oct 2024 14:19:45 -0700 Subject: [PATCH] Work around presets ignoring excluded tag args --- .github/workflows/dart_ci.yml | 8 ++++---- dart_test.yaml | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index b44ef740d..0ad2b65d2 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -92,9 +92,9 @@ jobs: DART_VERSION="${{ steps.setup-dart.outputs.dart-version }}" TEST_ARGS="" if [[ "$DART_VERSION" =~ ^3 ]]; then - TEST_ARGS="--exclude-tags=dart-2-only" + TEST_ARGS="--preset=no-dart-2" fi - dart test -P vm $TEST_ARGS + dart test --preset vm $TEST_ARGS if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success' - name: Run tests (DDC) @@ -156,9 +156,9 @@ jobs: DART_VERSION="${{ steps.setup-dart.outputs.dart-version }}" TEST_ARGS="" if [[ "$DART_VERSION" =~ ^3 ]]; then - TEST_ARGS="--exclude-tags=dart-2-only" + TEST_ARGS="--preset=no-dart-2" fi - dart test -p vm $TEST_ARGS -- test/vm_tests/builder + dart test --preset vm $TEST_ARGS -- test/vm_tests/builder analyzer_plugin: runs-on: ubuntu-latest diff --git a/dart_test.yaml b/dart_test.yaml index 096df915a..30e487165 100644 --- a/dart_test.yaml +++ b/dart_test.yaml @@ -12,6 +12,9 @@ presets: paths: - test/vm_tests/ + no-dart-2: + exclude_tags: dart-2-only + dartdevc: exclude_tags: no-ddc paths: