From aff0b60f3f9e9a452542164a8a3e1dad37105eec Mon Sep 17 00:00:00 2001 From: Martin Kinkelin Date: Sun, 17 Dec 2023 05:03:47 +0100 Subject: [PATCH] Fix AppVeyor CI --- Makefile | 6 +++--- appveyor.yml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 24629bf3f..e13efd265 100644 --- a/Makefile +++ b/Makefile @@ -99,10 +99,10 @@ $(ROOT)/tests_extractor$(DOTEXE): tests_extractor.d test_tests_extractor: $(ROOT)/tests_extractor$(DOTEXE) for file in ascii iteration ; do \ - $< -i "./test/tests_extractor/$${file}.d" | diff -p - "./test/tests_extractor/$${file}.d.ext"; \ + $< -i "./test/tests_extractor/$${file}.d" | diff --strip-trailing-cr -p - "./test/tests_extractor/$${file}.d.ext"; \ done - $< -a betterc -i "./test/tests_extractor/attributes.d" | diff -p - "./test/tests_extractor/attributes.d.ext"; - $< --betterC -i "./test/tests_extractor/betterc.d" | diff -p - "./test/tests_extractor/betterc.d.ext"; + $< -a betterc -i "./test/tests_extractor/attributes.d" | diff --strip-trailing-cr -p - "./test/tests_extractor/attributes.d.ext"; + $< --betterC -i "./test/tests_extractor/betterc.d" | diff --strip-trailing-cr -p - "./test/tests_extractor/betterc.d.ext"; RDMD_TEST_COMPILERS = $(DMD) RDMD_TEST_EXECUTABLE = $(ROOT)/rdmd$(DOTEXE) diff --git a/appveyor.yml b/appveyor.yml index 35aa457fc..07d466ef9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -65,7 +65,6 @@ test_script: - echo %DC% - echo %PATH% - '%DC% --version' - - make -f win32.mak DFLAGS=-g rdmd dustmite ddemangle changed - - make -f win32.mak DFLAGS=-g test - - make -f win64.mak DFLAGS=-g rdmd dustmite ddemangle changed - - make -f win64.mak DFLAGS=-g test + - choco install make + - make -j3 DMD=%DC% "DFLAGS=-m%MODEL% -g" rdmd dustmite ddemangle changed + - make -j3 DMD=%DC% "DFLAGS=-m%MODEL% -g" test