From 5c3d0f9123317da27cbd20434f60eb5579498da6 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Tue, 27 Feb 2024 11:30:52 +0100 Subject: [PATCH] try to convince test script to run on osx --- Makefile | 6 +++--- src/mxmake/topics/qa/test.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index bf2ebd1..9859505 100644 --- a/Makefile +++ b/Makefile @@ -494,9 +494,9 @@ $(TEST_TARGET): $(MXENV_TARGET) .PHONY: test test: $(FILES_TARGET) $(SOURCES_TARGET) $(PACKAGES_TARGET) $(TEST_TARGET) $(TEST_DEPENDENCY_TARGETS) - @echo "Run tests with $(TEST_COMMAND)" - @test -z "$(TEST_COMMAND)" && echo "No test command defined" - @test -z "$(TEST_COMMAND)" || $(TEST_COMMAND) + @test -z "$(TEST_COMMAND)" && echo "No test command defined" && exit 1 || : + @echo "Run tests using $(TEST_COMMAND)" + @/usr/bin/env bash -c "$(TEST_COMMAND)" .PHONY: test-dirty test-dirty: diff --git a/src/mxmake/topics/qa/test.mk b/src/mxmake/topics/qa/test.mk index 94ad197..1ae982d 100644 --- a/src/mxmake/topics/qa/test.mk +++ b/src/mxmake/topics/qa/test.mk @@ -33,9 +33,9 @@ $(TEST_TARGET): $(MXENV_TARGET) .PHONY: test test: $(FILES_TARGET) $(SOURCES_TARGET) $(PACKAGES_TARGET) $(TEST_TARGET) $(TEST_DEPENDENCY_TARGETS) - @echo "Run tests" - @test -z "$(TEST_COMMAND)" && echo "No test command defined" - @test -z "$(TEST_COMMAND)" || bash -c "$(TEST_COMMAND)" + @test -z "$(TEST_COMMAND)" && echo "No test command defined" && exit 1 || : + @echo "Run tests using $(TEST_COMMAND)" + @/usr/bin/env bash -c "$(TEST_COMMAND)" .PHONY: test-dirty test-dirty: