From 80d2a802290710fe5c6cf16fbfe09e3a24999737 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Mon, 10 Feb 2025 00:42:26 +0100 Subject: [PATCH] Fix failing rdmd_test introduced by a51571a (#480) * Fix failing rdmd_test introduced by a51571a * GHA: Test MacOS 13 only --- .github/workflows/main.yml | 2 +- rdmd_test.d | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24ed8bf..03547f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-latest, ubuntu-latest, windows-latest ] + os: [ macos-13, ubuntu-latest, windows-latest ] dc: [ dmd-latest, ldc-latest ] name: ${{ matrix.os }}, ${{ matrix.dc }} runs-on: ${{ matrix.os }} diff --git a/rdmd_test.d b/rdmd_test.d index 8815698..626f510 100755 --- a/rdmd_test.d +++ b/rdmd_test.d @@ -140,12 +140,12 @@ void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string mod /* Test help string output when no arguments passed. */ auto res = execute([rdmdApp]); enforce(res.status == 1, res.output); - enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]...")); + enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS...] program [PROGRAM OPTIONS...]")); /* Test --help. */ res = execute([rdmdApp, "--help"]); enforce(res.status == 0, res.output); - enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]...")); + enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS...] program [PROGRAM OPTIONS...]")); string helpText = res.output;