t/unit-tests: update to 10e96bc

Update to 10e96bc (Merge pull request #127 from
pks-gitlab/pks-ci-improvements, 2025-09-22). This commit includes a
couple of changes:

  - The GitHub CI has been updated to include a 32 bit CI job.
    Furthermore, the jobs now compile with "-Werror" and more warnings
    enabled.

  - An issue was addressed where `uintptr_t` is not available on
    NonStop [1].

  - The clar selftests have been restructured so that it is now possible
    to add small test suites more readily. This was done to add tests
    for the above addressed issue, where we now use "%p" to print
    pointers in a platform dependent way.

  - An issue was addressed where the test output had a trailing
    whitespace with certain output formats, which caused whitespace
    issues in the test expectation files.

[1]: <[email protected]>

Reported-by: Randall S. Becker <[email protected]>
Signed-off-by: Patrick Steinhardt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>

Author: pks-t

t/unit-tests/clar/.github/workflows/ci.yml

@@ -13,30 +13,47 @@ jobs:
         platform:
           - os: ubuntu-latest
             generator: Unix Makefiles
+            env:
+              CFLAGS: "-Werror -Wall -Wextra"
           - os: ubuntu-latest
             generator: Unix Makefiles
             env:
               CC: "clang"
-              CFLAGS: "-fsanitize=leak"
+              CFLAGS: "-Werror -Wall -Wextra -fsanitize=leak"
+          - os: ubuntu-latest
+            generator: Unix Makefiles
+            image: i386/debian:latest
+            env:
+              CFLAGS: "-Werror -Wall -Wextra"
           - os: macos-latest
             generator: Unix Makefiles
+            env:
+              CFLAGS: "-Werror -Wall -Wextra"
           - os: windows-latest
             generator: Visual Studio 17 2022
           - os: windows-latest
             generator: MSYS Makefiles
+            env:
+              CFLAGS: "-Werror -Wall -Wextra"
           - os: windows-latest
             generator: MinGW Makefiles
+            env:
+              CFLAGS: "-Werror -Wall -Wextra"
       fail-fast: false
 
     runs-on: ${{ matrix.platform.os }}
+    container: ${{matrix.platform.image}}
 
     env:
       CC: ${{matrix.platform.env.CC}}
       CFLAGS: ${{matrix.platform.env.CFLAGS}}
 
     steps:
+    - name: Prepare 32 bit container image
+      if: matrix.platform.image == 'i386/debian:latest'
+      run: apt -q update && apt -q -y install cmake gcc libc6-amd64 lib64stdc++6 make python3
     - name: Check out
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Build
       shell: bash
       run: |

t/unit-tests/clar/clar.c

@@ -195,7 +195,7 @@ struct clar_suite {
 };
 
 /* From clar_print_*.c */
-static void clar_print_init(int test_count, int suite_count, const char *suite_names);
+static void clar_print_init(int test_count, int suite_count);
 static void clar_print_shutdown(int test_count, int suite_count, int error_count);
 static void clar_print_error(int num, const struct clar_report *report, const struct clar_error *error);
 static void clar_print_ontest(const char *suite_name, const char *test_name, int test_number, enum cl_test_status failed);
@@ -592,11 +592,7 @@ clar_test_init(int argc, char **argv)
 	if (argc > 1)
 		clar_parse_args(argc, argv);
 
-	clar_print_init(
-		(int)_clar_callback_count,
-		(int)_clar_suite_count,
-		""
-	);
+	clar_print_init((int)_clar_callback_count, (int)_clar_suite_count);
 
 	if (!_clar.summary_filename &&
 	    (summary_env = getenv("CLAR_SUMMARY")) != NULL) {
@@ -875,8 +871,7 @@ void clar__assert_equal(
 		void *p1 = va_arg(args, void *), *p2 = va_arg(args, void *);
 		is_equal = (p1 == p2);
 		if (!is_equal)
-			p_snprintf(buf, sizeof(buf), "0x%"PRIxPTR" != 0x%"PRIxPTR,
-				   (uintptr_t)p1, (uintptr_t)p2);
+			p_snprintf(buf, sizeof(buf), "%p != %p", p1, p2);
 	}
 	else {
 		int i1 = va_arg(args, int), i2 = va_arg(args, int);

t/unit-tests/clar/clar/print.h

@@ -1,13 +1,13 @@
 /* clap: clar protocol, the traditional clar output format */
 
-static void clar_print_clap_init(int test_count, int suite_count, const char *suite_names)
+static void clar_print_clap_init(int test_count, int suite_count)
 {
 	(void)test_count;
 
 	if (_clar.verbosity < 0)
 		return;
 
-	printf("Loaded %d suites: %s\n", (int)suite_count, suite_names);
+	printf("Loaded %d suites:\n", (int)suite_count);
 	printf("Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')\n");
 }
 
@@ -103,11 +103,10 @@ static void clar_print_clap_onabort(const char *fmt, va_list arg)
 
 /* tap: test anywhere protocol format */
 
-static void clar_print_tap_init(int test_count, int suite_count, const char *suite_names)
+static void clar_print_tap_init(int test_count, int suite_count)
 {
 	(void)test_count;
 	(void)suite_count;
-	(void)suite_names;
 	printf("TAP version 13\n");
 }
 
@@ -207,9 +206,9 @@ static void clar_print_tap_onabort(const char *fmt, va_list arg)
 		} \
 	} while (0)
 
-static void clar_print_init(int test_count, int suite_count, const char *suite_names)
+static void clar_print_init(int test_count, int suite_count)
 {
-	PRINT(init, test_count, suite_count, suite_names);
+	PRINT(init, test_count, suite_count);
 }
 
 static void clar_print_shutdown(int test_count, int suite_count, int error_count)

t/unit-tests/clar/generate.py

@@ -158,17 +158,24 @@ def should_generate(self, path):
 
     def find_modules(self):
         modules = []
-        for root, _, files in os.walk(self.path):
-            module_root = root[len(self.path):]
-            module_root = [c for c in module_root.split(os.sep) if c]
 
-            tests_in_module = fnmatch.filter(files, "*.c")
+        if os.path.isfile(self.path):
+            full_path = os.path.abspath(self.path)
+            module_name = os.path.basename(self.path)
+            module_name = os.path.splitext(module_name)[0]
+            modules.append((full_path, module_name))
+        else:
+            for root, _, files in os.walk(self.path):
+                module_root = root[len(self.path):]
+                module_root = [c for c in module_root.split(os.sep) if c]
 
-            for test_file in tests_in_module:
-                full_path = os.path.join(root, test_file)
-                module_name = "_".join(module_root + [test_file[:-2]]).replace("-", "_")
+                tests_in_module = fnmatch.filter(files, "*.c")
 
-                modules.append((full_path, module_name))
+                for test_file in tests_in_module:
+                    full_path = os.path.join(root, test_file)
+                    module_name = "_".join(module_root + [test_file[:-2]]).replace("-", "_")
+
+                    modules.append((full_path, module_name))
 
         return modules
 
@@ -217,6 +224,7 @@ def callback_count(self):
 
     def write(self):
         output = os.path.join(self.output, 'clar.suite')
+        os.makedirs(self.output, exist_ok=True)
 
         if not self.should_generate(output):
             return False
@@ -258,7 +266,11 @@ def write(self):
         sys.exit(1)
 
     path = args.pop() if args else '.'
+    if os.path.isfile(path) and not options.output:
+        print("Must provide --output when specifying a file")
+        sys.exit(1)
     output = options.output or path
+
     suite = TestSuite(path, output)
     suite.load(options.force)
     suite.disable(options.excluded)

t/unit-tests/clar/test/CMakeLists.txt

@@ -1,5 +1,3 @@
-add_subdirectory(selftest_suite)
-
 find_package(Python COMPONENTS Interpreter REQUIRED)
 
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/clar.suite"
@@ -40,15 +38,12 @@ target_include_directories(selftest PRIVATE
 )
 target_link_libraries(selftest clar)
 
-add_test(NAME build_selftest_suite
-	COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --config "$<CONFIG>" --target selftest_suite
-)
-set_tests_properties(build_selftest_suite PROPERTIES FIXTURES_SETUP clar_test_fixture)
-
 add_test(NAME build_selftest
 	COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --config "$<CONFIG>" --target selftest
 )
 set_tests_properties(build_selftest PROPERTIES FIXTURES_SETUP clar_test_fixture)
 
-add_test(NAME selftest COMMAND "${CMAKE_CURRENT_BINARY_DIR}/selftest" "$<TARGET_FILE:selftest_suite>")
+add_subdirectory(suites)
+
+add_test(NAME selftest COMMAND "${CMAKE_CURRENT_BINARY_DIR}/selftest" $<TARGET_FILE_DIR:combined_suite>)
 set_tests_properties(selftest PROPERTIES FIXTURES_REQUIRED clar_test_fixture)

t/unit-tests/clar/test/expected/help

@@ -1,4 +1,4 @@
-Usage: selftest [options]
+Usage: combined [options]
 
 Options:
   -sname        Run only the suite with `name` (can go to individual test name)

t/unit-tests/clar/test/expected/quiet

@@ -1,49 +1,44 @@
   1) Failure:
-selftest::suite::1 [file:42]
+combined::1 [file:42]
   Function call failed: -1
 
   2) Failure:
-selftest::suite::2 [file:42]
+combined::2 [file:42]
   Expression is not true: 100 == 101
 
   3) Failure:
-selftest::suite::strings [file:42]
+combined::strings [file:42]
   String mismatch: "mismatched" != actual ("this one fails")
   'mismatched' != 'expected' (at byte 0)
 
   4) Failure:
-selftest::suite::strings_with_length [file:42]
+combined::strings_with_length [file:42]
   String mismatch: "exactly" != actual ("this one fails")
   'exa' != 'exp' (at byte 2)
 
   5) Failure:
-selftest::suite::int [file:42]
+combined::int [file:42]
   101 != value ("extra note on failing test")
   101 != 100
 
   6) Failure:
-selftest::suite::int_fmt [file:42]
+combined::int_fmt [file:42]
   022 != value
   0022 != 0144
 
   7) Failure:
-selftest::suite::bool [file:42]
+combined::bool [file:42]
   0 != value
   0 != 1
 
   8) Failure:
-selftest::suite::ptr [file:42]
-  Pointer mismatch: p1 != p2
-  0x1 != 0x2
-
-  9) Failure:
-selftest::suite::multiline_description [file:42]
+combined::multiline_description [file:42]
   Function call failed: -1
   description line 1
   description line 2
 
-  10) Failure:
-selftest::suite::null_string [file:42]
+  9) Failure:
+combined::null_string [file:42]
   String mismatch: "expected" != actual ("this one fails")
   'expected' != NULL
 

t/unit-tests/clar/test/expected/specific_test

@@ -1,9 +1,9 @@
-Loaded 1 suites: 
+Loaded 1 suites:
 Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
 F
 
   1) Failure:
-selftest::suite::bool [file:42]
+combined::bool [file:42]
   0 != value
   0 != 1
 

t/unit-tests/clar/test/expected/stop_on_failure

@@ -1,8 +1,8 @@
-Loaded 1 suites: 
+Loaded 1 suites:
 Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
 F
 
   1) Failure:
-selftest::suite::1 [file:42]
+combined::1 [file:42]
   Function call failed: -1
 

t/unit-tests/clar/test/expected/suite_names

@@ -1,2 +1,2 @@
 Test suites (use -s<name> to run just one):
-   0: selftest::suite
+   0: combined