From 5c7ac14a322de30c3264cbd33c550809660e8de7 Mon Sep 17 00:00:00 2001 From: Taiju Yamada Date: Sun, 3 Mar 2024 22:58:47 +0900 Subject: [PATCH 1/2] tools: replace echo -n with printf Signed-off-by: Taiju Yamada --- tools/gen_nmake.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/gen_nmake.mk b/tools/gen_nmake.mk index b0ceb32b..55952fb8 100644 --- a/tools/gen_nmake.mk +++ b/tools/gen_nmake.mk @@ -14,7 +14,7 @@ Makefile.nmake tst.nmake: FORCE @echo '' >> $@ @echo '# This file can be auto-regenerated with $$make -f Makefile.unx Makefile.nmake' >> $@ @echo '' >> $@ - @echo -n 'objs =' >> $@ + @printf 'objs =' >> $@ @$(foreach o, $(subst /,\\,$(objs:.o=.obj)), printf " %s\n\t%s" \\ $(o) >> $@; ) @echo '' >> $@ @echo '' >> $@ @@ -60,7 +60,7 @@ Makefile.nmake tst.nmake: FORCE @echo '' >> $@ ifneq (,$(examples)) @echo "# Examples" >> $@ - @echo -n 'ex =' >> $@ + @printf 'ex =' >> $@ @$(foreach ex, $(notdir $(examples)), printf " %s\n\t%s.exe" \\ $(ex) >> $@; ) @echo '' >> $@ @echo '' >> $@ @@ -75,7 +75,7 @@ endif @echo ' link /out:$$@ $$(LINKFLAGS) isa-l.lib $$?' >> $@ @echo '' >> $@ @echo '# Check tests' >> $@ - @echo -n 'checks =' >> $@ + @printf 'checks =' >> $@ @$(foreach check, $(notdir $(check_tests)), printf " %s\n\t%s.exe" \\ $(check) >> $@; ) @echo '' >> $@ @echo '' >> $@ @@ -85,7 +85,7 @@ endif @echo ' !$$?' >> $@ @echo '' >> $@ @echo '# Unit tests' >> $@ - @echo -n 'tests =' >> $@ + @printf 'tests =' >> $@ @$(foreach test, $(notdir $(unit_tests)), printf " %s\n\t%s.exe" \\ $(test) >> $@; ) @echo '' >> $@ @echo '' >> $@ @@ -93,14 +93,14 @@ endif @echo '$$(tests): $$(@B).obj' >> $@ @echo '' >> $@ @echo '# Performance tests' >> $@ - @echo -n 'perfs =' >> $@ + @printf 'perfs =' >> $@ @$(foreach perf, $(notdir $(perf_tests)), printf " %s\n\t%s.exe" \\ $(perf) >> $@; ) @echo '' >> $@ @echo '' >> $@ @echo 'perfs: lib $$(perfs)' >> $@ @echo '$$(perfs): $$(@B).obj' >> $@ @echo '' >> $@ - @echo -n 'progs =' >> $@ + @printf 'progs =' >> $@ @$(foreach prog, $(notdir $(bin_PROGRAMS)), printf " %s\n\t%s.exe" \\ $(prog) >> $@; ) @echo '' >> $@ @echo '' >> $@ From 6262b96e8bccf1933ec6af6019fefdf62b3ef463 Mon Sep 17 00:00:00 2001 From: Taiju Yamada Date: Sun, 3 Mar 2024 23:04:23 +0900 Subject: [PATCH 2/2] enable macOS extended test Signed-off-by: Taiju Yamada --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 694a854e..c55c5876 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,6 @@ jobs: run: bash tools/test_checks.sh - name: Run extended tests run: bash tools/test_extended.sh - if: runner.os == 'Linux' # Fails on Mac OS due to nmake consistency issue run_tests_windows: needs: check_format