Worked on tests and changes for CI tests

joachimmetz · joachimmetz · commit 1d3c88ccd281 · 2026-06-01T17:47:10.000+02:00
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -44,7 +44,7 @@ jobs:
     - name: Install Cygwin and build dependencies
       uses: cygwin/cygwin-install-action@v6
       with:
-        packages: autoconf, automake, binutils, gcc-core, gettext-devel, git, libtool, make, pkg-config
+        packages: autoconf, automake, binutils, curl, gcc-core, gettext-devel, git, libtool, make, pkg-config
         platform: x86_64
         add-to-path: true
     - name: Download test data
@@ -87,7 +87,7 @@ jobs:
       with:
         msystem: MINGW64
         update: true
-        install: autoconf automake gettext gettext-devel git libtool make mingw-w64-x86_64-gcc pkg-config
+        install: autoconf automake curl git libtool make mingw-w64-x86_64-gcc mingw-w64-x86_64-gettext-runtime mingw-w64-x86_64-gettext-tools pkg-config
     - name: Download test data
       shell: msys2 {0}
       run: |
diff --git a/.github/workflows/check_source.yml b/.github/workflows/check_source.yml
@@ -33,7 +33,7 @@ jobs:
         make > /dev/null
     - name: Run tests
       run: |
-        make check CHECK_WITH_ASAN=1 CHECK_WITH_STDERR=1
+        tests/runtests.sh
   scan_build:
     name: Check source with scan-build
     runs-on: ${{ matrix.os }}
@@ -124,4 +124,4 @@ jobs:
         make > /dev/null
     - name: Run tests
       run: |
-        make check CHECK_WITH_STDERR=1
+        tests/runtests.sh
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Install Cygwin and build dependencies
       uses: cygwin/cygwin-install-action@v6
       with:
-        packages: autoconf, automake, curl, gettext-devel, git, libtool, make, mingw-w64-x86_64-gcc, pkg-config
+        packages: autoconf, automake, binutils, curl, gcc-core, gettext-devel, git, libtool, make, pkg-config
         platform: x86_64
         add-to-path: true
     - name: Download test data
@@ -119,7 +119,7 @@ jobs:
       with:
         msystem: MINGW64
         update: true
-        install: autoconf automake gettext gettext-devel git libtool make mingw-w64-x86_64-gcc pkg-config
+        install: autoconf automake curl git libtool make mingw-w64-x86_64-gcc mingw-w64-x86_64-gettext-runtime mingw-w64-x86_64-gettext-tools pkg-config
     - name: Download test data
       shell: msys2 {0}
       run: |
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
   [libfvalue],
-  [20260531],
+  [20260601],
   [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(
diff --git a/libfvalue/libfvalue_extern.h b/libfvalue/libfvalue_extern.h
@@ -24,6 +24,19 @@
 
 #include <common.h>
 
+#if !defined( __CYGWIN__ ) && !defined( _WIN32 ) && defined( __has_attribute )
+#if __has_attribute( visibility )
+#define LIBFVALUE_INTERNAL	__attribute__((visibility("hidden"))) extern
+
+#else
+#define LIBFVALUE_INTERNAL	extern
+
+#endif /* __has_attribute( visibility ) */
+#else
+#define LIBFVALUE_INTERNAL	extern
+
+#endif /* !defined( __CYGWIN__ ) && !defined( _WIN32 ) && defined( __has_attribute ) */
+
 /* Define HAVE_LOCAL_LIBFVALUE for local use of libfvalue
  */
 #if !defined( HAVE_LOCAL_LIBFVALUE )
@@ -32,7 +45,7 @@
 
 #else
 #define LIBFVALUE_EXTERN		/* extern */
-#define LIBFVALUE_EXTERN_VARIABLE	extern
+#define LIBFVALUE_EXTERN_VARIABLE	LIBFVALUE_INTERNAL
 
 #endif /* !defined( HAVE_LOCAL_LIBFVALUE ) */
 
diff --git a/libfvalue/libfvalue_value.c b/libfvalue/libfvalue_value.c
@@ -1160,7 +1160,7 @@ int libfvalue_value_initialize_data(
 		goto on_error;
 	}
 #if defined( __clang_analyzer__ )
-	__builtin_assume( ( (libfvalue_internal_data_handle_t *) internal_value->data_handle )->data == data );
+	free( data );
 #endif
 	return( 1 );
 
diff --git a/m4/tests.m4 b/m4/tests.m4
@@ -1,6 +1,6 @@
 dnl Functions for testing
 dnl
-dnl Version: 20260530
+dnl Version: 20260601
 
 dnl Function to detect whether the file system is case-insensitive
 AC_DEFUN([AX_TEST_CHECK_FILE_SYSTEM_IS_CASE_INSENSITIVE],
@@ -183,15 +183,19 @@ AC_DEFUN([AX_TESTS_CHECK_LOCAL],
     dl,
     dlsym)
 
-  AX_TEST_CHECK_FILE_SYSTEM_IS_CASE_INSENSITIVE
-
   AS_IF(
     [test "x$lt_cv_prog_gnu_ld" = xyes && test "x$ac_cv_lib_dl_dlsym" = xyes],
     [AC_DEFINE(
       [HAVE_GNU_DL_DLSYM],
       [1],
       [Define to 1 if dlsym function is available in GNU dl.])
     ])
+
+  AX_TEST_CHECK_FILE_SYSTEM_IS_CASE_INSENSITIVE
+
+  AC_SUBST(
+    [TESTS_USE_WINAPI],
+    [$ac_cv_enable_winapi])
   ])
 
 dnl Function to detect if OSS-Fuzz build environment is available
diff --git a/runtests.sh b/runtests.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Script that runs the tests
 #
-# Version: 20260529
+# Version: 20260531
 
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
@@ -92,7 +92,7 @@ run_configure_make_check_with_asan()
 		return ${RESULT}
 	fi
 
-	make check CHECK_WITH_ASAN=1 CHECK_WITH_STDERR=1
+	make check CHECK_WITH_STDERR=1
 	RESULT=$?
 
 	if test ${RESULT} -ne ${EXIT_SUCCESS}
diff --git a/tests/lsan.suppressions b/tests/lsan.suppressions
diff --git a/tests/test_library.sh b/tests/test_library.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Tests library functions and types.
 #
-# Version: 20260509
+# Version: 20260531
 
 EXIT_SUCCESS=0;
 EXIT_FAILURE=1;
@@ -99,11 +99,6 @@ run_test_with_input()
 		do
 			OPTION_INPUT_FILE="${INPUT_FILE}";
 
-			if test "${OSTYPE}" = "msys";
-			then
-				# A test executable built with MinGW expects a Windows path.
-				INPUT_FILE=`echo ${INPUT_FILE} | sed 's?/?\\\\?g'`;
-			fi
 			local TESTED_WITH_OPTIONS=0;
 
 			for OPTION_SET in ${OPTION_SETS[@]};
diff --git a/tests/test_runner.sh b/tests/test_runner.sh
@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 # Bash functions to run an executable for testing.
 #
-# Version: 20260528
-#
-# When CHECK_WITH_ASAN is set to a non-empty value the test executable
-# is run with asan, otherwise it is run without.
+# Version: 20260601
 #
 # When CHECK_WITH_STDERR is set to a non-empty value the test executable
 # is run with error output to stderr.
@@ -386,7 +383,6 @@ read_test_data_option_file()
 # Runs the test with optional arguments.
 #
 # Globals:
-#   CHECK_WITH_ASAN
 #   CHECK_WITH_STDERR
 #
 # Arguments:
@@ -435,74 +431,7 @@ run_test_with_arguments()
 	fi
 	local RESULT=0;
 
-	if test -n "${CHECK_WITH_ASAN}";
-	then
-		local TEST_EXECUTABLE=$( find_binary_executable ${TEST_EXECUTABLE} );
-		local LIBRARY_PATH=$( find_binary_library_path ${TEST_EXECUTABLE} );
-		local PYTHON_MODULE_PATH=$( find_binary_python_module_path ${TEST_EXECUTABLE} );
-
-		local LSAN_SUPPRESSIONS="lsan.suppressions";
-
-		if ! test -f ${LSAN_SUPPRESSIONS};
-		then
-			LSAN_SUPPRESSIONS="../lsan.suppressions";
-		fi
-		if test "${PLATFORM}" = "Darwin";
-		then
-			if test ${IS_PYTHON_SCRIPT} -eq 0;
-			then
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" DYLD_LIBRARY_PATH="${LIBRARY_PATH}" PYTHONPATH="${PYTHON_MODULE_PATH}" "${PYTHON}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]};
-				RESULT=$?;
-			else
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" DYLD_LIBRARY_PATH="${LIBRARY_PATH}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]};
-				RESULT=$?;
-			fi
-		else
-			local CONFIG_LOG="../config.log";
-
-			if ! test -f ${CONFIG_LOG};
-			then
-				CONFIG_LOG="../../config.log";
-			fi
-			local CC=`cat ${CONFIG_LOG} | grep -e "^CC=" | sed "s/CC='\\(.*\\)'/\1/"`;
-			local LIBASAN="";
-
-			if test -z ${CC} || test ${CC} != "clang";
-			then
-				local LDCONFIG=`which ldconfig 2> /dev/null`;
-
-				if test -z ${LDCONFIG} || ! test -x ${LDCONFIG};
-				then
-					LDCONFIG="/sbin/ldconfig";
-				fi
-				if test -z ${LDCONFIG} || ! test -x ${LDCONFIG};
-				then
-					echo "Missing binary: ldconfig";
-					echo "";
-
-					exit ${EXIT_FAILURE};
-				fi
-				LIBASAN=`${LDCONFIG} -p | grep libasan | sed 's/^.* => //' | sort | tail -n 1`;
-
-				if ! test -f ${LIBASAN};
-				then
-					echo "Missing library: ${BINARY}";
-					echo "";
-
-					exit ${EXIT_FAILURE};
-				fi
-			fi
-			if test ${IS_PYTHON_SCRIPT} -eq 0;
-			then
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" LD_PRELOAD="${LIBASAN}" LD_LIBRARY_PATH="${LIBRARY_PATH}" PYTHONPATH="${PYTHON_MODULE_PATH}" "${PYTHON}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]};
-				RESULT=$?;
-			else
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" LD_PRELOAD="${LIBASAN}" LD_LIBRARY_PATH="${LIBRARY_PATH}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]};
-				RESULT=$?;
-			fi
-		fi
-
-	elif test ${IS_PYTHON_SCRIPT} -eq 0;
+	if test ${IS_PYTHON_SCRIPT} -eq 0;
 	then
 		if ! test -f "${TEST_EXECUTABLE}";
 		then
@@ -582,7 +511,6 @@ run_test_with_arguments()
 # Runs the test with an input file and optional arguments.
 #
 # Globals:
-#   CHECK_WITH_ASAN
 #   CHECK_WITH_STDERR
 #
 # Arguments:
@@ -631,75 +559,25 @@ run_test_with_input_and_arguments()
 	fi
 	local RESULT=0;
 
-	if test -n "${CHECK_WITH_ASAN}";
+	# TODO: add support for "${MSYSTEM}" = "UCRT64"
+	if test ${TESTS_USE_WINAPI} = "yes" || test "${MSYSTEM}" = "MINGW32" || test "${MSYSTEM}" = "MINGW64";
 	then
-		local TEST_EXECUTABLE=$( find_binary_executable ${TEST_EXECUTABLE} );
-		local LIBRARY_PATH=$( find_binary_library_path ${TEST_EXECUTABLE} );
-		local PYTHON_MODULE_PATH=$( find_binary_python_module_path ${TEST_EXECUTABLE} );
+		INPUT_FILE=`cygpath -w "${INPUT_FILE}"`;
 
-		local LSAN_SUPPRESSIONS="lsan.suppressions";
-
-		if ! test -f ${LSAN_SUPPRESSIONS};
+	elif test "${OSTYPE}" != "cygwin" && test "${OSTYPE}" != "msys";
+	then
+		if ! test -x ${OBJDUMP};
 		then
-			LSAN_SUPPRESSIONS="../lsan.suppressions";
+			echo "Missing executable: ${OBJDUMP}";
+
+			exit ${EXIT_FAILURE};
 		fi
-		if test "${PLATFORM}" = "Darwin";
+		if ${OBJDUMP} -f "${TEST_EXECUTABLE}" 2>&1 | grep -q "pei-";
 		then
-			# TODO DYLD_INSERT_LIBRARIES=/Library/Developer/CommandLineTools/usr/lib/clang/8.1.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib
-			if test ${IS_PYTHON_SCRIPT} -eq 0;
-			then
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" DYLD_LIBRARY_PATH="${LIBRARY_PATH}" PYTHONPATH="${PYTHON_MODULE_PATH}" "${PYTHON}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]} "${INPUT_FILE}";
-				RESULT=$?;
-			else
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" DYLD_LIBRARY_PATH="${LIBRARY_PATH}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]} "${INPUT_FILE}";
-				RESULT=$?;
-			fi
-		else
-			local CONFIG_LOG="../config.log";
-
-			if ! test -f ${CONFIG_LOG};
-			then
-				CONFIG_LOG="../../config.log";
-			fi
-			local CC=`cat ${CONFIG_LOG} | grep -e "^CC=" | sed "s/CC='\\(.*\\)'/\1/"`;
-			local LIBASAN="";
-
-			if test -z ${CC} || test ${CC} != "clang";
-			then
-				local LDCONFIG=`which ldconfig 2> /dev/null`;
-
-				if test -z ${LDCONFIG} || ! test -x ${LDCONFIG};
-				then
-					LDCONFIG="/sbin/ldconfig";
-				fi
-				if test -z ${LDCONFIG} || ! test -x ${LDCONFIG};
-				then
-					echo "Missing binary: ldconfig";
-					echo "";
-
-					exit ${EXIT_FAILURE};
-				fi
-				LIBASAN=`${LDCONFIG} -p | grep libasan | sed 's/^.* => //' | sort | tail -n 1`;
-
-				if ! test -f ${LIBASAN};
-				then
-					echo "Missing library: ${BINARY}";
-					echo "";
-
-					exit ${EXIT_FAILURE};
-				fi
-			fi
-			if test ${IS_PYTHON_SCRIPT} -eq 0;
-			then
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" LD_PRELOAD="${LIBASAN}" LD_LIBRARY_PATH="${LIBRARY_PATH}" PYTHONPATH="${PYTHON_MODULE_PATH}" "${PYTHON}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]} "${INPUT_FILE}";
-				RESULT=$?;
-			else
-				LSAN_OPTIONS=suppressions="${LSAN_SUPPRESSIONS}" LD_PRELOAD="${LIBASAN}" LD_LIBRARY_PATH="${LIBRARY_PATH}" "${TEST_EXECUTABLE}" ${ARGUMENTS[@]} "${INPUT_FILE}";
-				RESULT=$?;
-			fi
+			INPUT_FILE=`winepath -w "${INPUT_FILE}"`;
 		fi
-
-	elif test ${IS_PYTHON_SCRIPT} -eq 0;
+	fi
+	if test ${IS_PYTHON_SCRIPT} -eq 0;
 	then
 		if ! test -f "${TEST_EXECUTABLE}";
 		then
@@ -752,7 +630,6 @@ run_test_with_input_and_arguments()
 
 			return ${EXIT_FAILURE};
 		fi
-
 		if test -n "${CHECK_WITH_STDERR}";
 		then
 			${TEST_EXECUTABLE} ${ARGUMENTS[@]} "${INPUT_FILE}";

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,7 @@ int libfvalue_value_initialize_data(`
`1160`	`1160`	`goto on_error;`
`1161`	`1161`	`}`
`1162`	`1162`	`#if defined( __clang_analyzer__ )`
`1163`		`- __builtin_assume( ( (libfvalue_internal_data_handle_t *) internal_value->data_handle )->data == data );`
	`1163`	`+ free( data );`
`1164`	`1164`	`#endif`
`1165`	`1165`	`return( 1 );`
`1166`	`1166`