Merge remote-tracking branch 'origin/master'

# Conflicts:
#	c89stringutils/c89stringutils_string_extras.h

Author: SamuelMarks

.github/workflows/linux-Windows-macOS-sunOS.yml

@@ -23,12 +23,12 @@ jobs:
         with:
           prepare: pkg install cmake wget
           run: |
-            mkdir build && cd build
-            mkdir -p c89stringutils_tests/test_downloads
+            mkdir -p build/c89stringutils_tests/test_downloads
+            cd build
             /opt/ooce/bin/wget https://raw.githubusercontent.com/silentbicycle/greatest/11a6af1/greatest.h -o c89stringutils_tests/test_downloads/greatest.h
             /opt/ooce/bin/cmake -DCMAKE_BUILD_TYPE="Debug" ..
             /opt/ooce/bin/cmake --build .
-            /opt/ooce/bin/ctest -C Debug .
+            /opt/ooce/bin/ctest -C Debug --rerun-failed --output-on-failure .
         if: matrix.os == 'macos-10.15'
       - name: mkdir
         run: mkdir build
@@ -41,5 +41,5 @@ jobs:
         if: matrix.os != 'macos-10.15'
       - name: test
         working-directory: ./build
-        run: ctest -C Debug .
+        run: ctest -C Debug --rerun-failed --output-on-failure .
         if: matrix.os != 'macos-10.15'

c89stringutils_tests/test_c89stringutils/test_string_extras.h

@@ -12,15 +12,23 @@ TEST x_strnstr_should_succeed(void) {
 }
 
 TEST x_strnstr_should_fail(void) {
-  ASSERT_EQ(strcmp(buffer, strnstr(buffer, target, strlen(buffer))), 0);
+  ASSERT_STR_EQ(buffer, strnstr(buffer, target, strlen(buffer)));
+  PASS();
+}
+
+TEST x_asprintf_should_succeed(void) {
+  char *s = NULL;
+  asprintf(&s, "foo%s", "bar");
+  ASSERT_STR_EQ("foobar", s);
+  free(s);
   PASS();
 }
 
 TEST x_jasprintf_should_succeed(void) {
   char *s = NULL;
   jasprintf(&s, "foo%s", "bar");
   jasprintf(&s, "can%s", "haz");
-  ASSERT_EQ(strcmp(s, "foobarcanhaz"), 0);
+  ASSERT_STR_EQ("foobarcanhaz", s);
   free(s);
   PASS();
 }
@@ -29,5 +37,6 @@ TEST x_jasprintf_should_succeed(void) {
 SUITE(strnstr_suite) {
   RUN_TEST(x_strnstr_should_succeed);
   RUN_TEST(x_strnstr_should_fail);
+  RUN_TEST(x_asprintf_should_succeed);
   RUN_TEST(x_jasprintf_should_succeed);
 }