diff --git a/test/4-describe-data-2-dmd.sh b/test/4-describe-data-2-dmd.sh index 53964f9..f0d0bb6 100755 --- a/test/4-describe-data-2-dmd.sh +++ b/test/4-describe-data-2-dmd.sh @@ -2,9 +2,9 @@ set -e -o pipefail -if ! dmd --help >/dev/null; then - echo Skipping DMD-centric test on configuration that lacks DMD. - exit +if [ "${DC}" != "dmd" ]; then + echo Skipping DMD-centric test on configuration that lacks DMD. + exit fi cd "$CURR_DIR"/describe-project @@ -17,7 +17,7 @@ trap cleanup EXIT -if ! $DUB describe --compiler=dmd \ +if ! $DUB describe --compiler=${DC} \ --data=main-source-file \ --data=dflags,lflags \ --data=libs,linker-files \ diff --git a/test/4-describe-data-3-zero-delim.sh b/test/4-describe-data-3-zero-delim.sh index 21f2675..2d6738b 100755 --- a/test/4-describe-data-3-zero-delim.sh +++ b/test/4-describe-data-3-zero-delim.sh @@ -91,18 +91,18 @@ fi # DMD-only beyond this point -if ! dmd --help >/dev/null; then - echo Skipping DMD-centric tests on configuration that lacks DMD. - exit +if [ "${DC}" != "dmd" ]; then + echo Skipping DMD-centric tests on configuration that lacks DMD. + exit fi # Test dmd-style --data=versions -if ! $DUB describe --compiler=dmd --data=versions \ +if ! $DUB describe --compiler=$DC --data=versions \ > "$temp_file_normal"; then die 'Printing dmd-style --data=versions failed!' fi -if ! $DUB describe --compiler=dmd --data-0 --data=versions \ +if ! $DUB describe --compiler=$DC --data-0 --data=versions \ | xargs -0 printf "%s " > "$temp_file_zero_delim"; then die 'Printing null-delimited dmd-style --data=versions failed!' fi @@ -112,12 +112,12 @@ fi # Test dmd-style --data=source-files -if ! $DUB describe --compiler=dmd --data=source-files \ +if ! $DUB describe --compiler=$DC --data=source-files \ > "$temp_file_normal"; then die 'Printing dmd-style --data=source-files failed!' fi -if ! $DUB describe --compiler=dmd --data-0 --data=source-files \ +if ! $DUB describe --compiler=$DC --data-0 --data=source-files \ | xargs -0 printf "'%s' " > "$temp_file_zero_delim"; then die 'Printing null-delimited dmd-style --data=source-files failed!' fi