fix docker "make" invocation

MarlinFirmware · Apr 9, 2024 · 4118f36 · 4118f36
1 parent fd351a9
commit 4118f36
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   test_builds:
-    name: CI - All Build Tests
+    name: Build Test
     if: github.repository == 'MarlinFirmware/Marlin'
 
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
@@ -31,7 +31,7 @@ jobs:
   # This runs all unit tests as a single job. While it should be possible to break this up into
   # multiple jobs, they currently run quickly and finish long before the compilation tests.
   run_unit_tests:
-    name: CI - All Unit Tests
+    name: Unit Test
     # These tests will only be able to run on the bugfix-2.1.x branch, until the next release
     # pulls them into additional branches.
     if: github.repository == 'MarlinFirmware/Marlin'

diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ tests-single-local:
 tests-single-local-docker:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
 	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
+	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
 
 tests-all-local:
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
@@ -57,7 +57,7 @@ tests-all-local:
 
 tests-all-local-docker:
 	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
+	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
 
 #unit-test-single-ci:
 #	export GIT_RESET_HARD=true
@@ -71,14 +71,14 @@ tests-all-local-docker:
 #unit-test-single-local-docker:
 #	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make unit-test-all-local-docker" ; return 1; fi
 #	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-#	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) $(MAKE) unit-test-single-local TEST_TARGET=$(TEST_TARGET) ONLY_TEST="$(ONLY_TEST)"
+#	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-single-local TEST_TARGET=$(TEST_TARGET) ONLY_TEST="$(ONLY_TEST)"
 
 unit-test-all-local:
 	platformio run -t test-marlin -e linux_native_test
 
 unit-test-all-local-docker:
 	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) $(MAKE) unit-test-all-local
+	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-all-local
 
 setup-local-docker:
 	$(CONTAINER_RT_BIN) buildx build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .

diff --git a/Marlin/tests/types/test_types.cpp b/Marlin/tests/types/test_types.cpp
@@ -127,12 +127,12 @@ MARLIN_TEST(types, MString1) {
   str20.append(1234.5f).append(',').append(' ')
        .append(2345.67).append(',').append(' ');
 
-  TEST_ASSERT_TRUE(strcmp_P(str20.str, PSTR("F-string, 1234.50, 2")) == 0);
+  TEST_ASSERT_TRUE(strcmp_P(str20, PSTR("F-string, 1234.50, 2")) == 0);
 
   // Truncate to "F-string"
   str20.trunc(8);
 
-  TEST_ASSERT_FALSE(strcmp_P(str20.str, PSTR("F-string")) != 0);
+  TEST_ASSERT_FALSE(strcmp_P(&str20, PSTR("F-string")) != 0);
 }
 
 MARLIN_TEST(types, MString2) {
@@ -141,7 +141,7 @@ MARLIN_TEST(types, MString2) {
 }
 
 MARLIN_TEST(types, SString) {
-  // Hello World!-123456------   <spaces!33
+  // Hello World!-123456------   < spaces!33
   // ^ eol! ... 1234.50*2345.602 = 2895645.67
   SString<100> str(F("Hello"));
   str.append(F(" World!"));
@@ -154,8 +154,7 @@ MARLIN_TEST(types, SString) {
   str += int8_t(33);
   str.eol();
   str += "^ eol!";
+  str.append(" ... ", 1234.5f, '*', p_float_t(2345.602, 3), F(" = "), 1234.5 * 2345.602);
 
-  str.append("...", 1234.5f, '*', p_float_t(2345.602, 3), F(" = "), 1234.5 * 2345.602);
-
-  TEST_ASSERT_TRUE(strcmp_P(str, PSTR("Hello World!-123456------   <spaces!33\n^ eol! ... 1234.50*2345.602 = 2895645.67")) == 0);
+  TEST_ASSERT_TRUE(strcmp_P(str, PSTR("Hello World!-123456------   < spaces!33\n^ eol!...1234.50*2345.602 = 2895645.67")) == 0);
 }