Skip to content

Commit c45c466

Browse files
committed
Fix use of the DC variable for Windows tests.
1 parent d707cb6 commit c45c466

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ jobs:
124124
env:
125125
DUB: ${{ github.workspace }}\bin\dub.exe
126126
run: |
127-
dub build --compiler=${{ env.DC }}
127+
dub build --compiler='${{ env.DC }}'
128128
if [[ ${{ matrix.do_test }} == 'true' ]]; then
129-
dub test --compiler=${{ env.DC }}
130-
dub run --compiler=${{ env.DC }} --single test/issue2051_running_unittests_from_dub_single_file_packages_fails.d
129+
dub test --compiler='${{ env.DC }}'
130+
dub run --compiler='${{ env.DC }}' --single test/issue2051_running_unittests_from_dub_single_file_packages_fails.d
131131
dub --single test/run-unittest.d
132132
133133
# FIXME: DMD fails a few tests on Windows; remove them for now
134-
if [[ '${{ matrix.dc }}' = dmd* ]]; then
134+
if [[ '${{ matrix.dc }}' = *dmd* ]]; then
135135
# DLL support is lacking
136136
rm -rf test/{1-dynLib-simple,2-dynLib-dep,2-dynLib-with-staticLib-dep}
137137
# Unicode in paths too

test/run-unittest.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env bash
22
set -ueo pipefail
33

4+
DC="${DC//\\//}"
5+
46
. $(dirname "${BASH_SOURCE[0]}")/common.sh
57

68
> $(dirname "${BASH_SOURCE[0]}")/test.log

0 commit comments

Comments
 (0)