Worked on tests and changes for CI tests

Author: joachimmetz

.github/workflows/build_freebsd.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
-    - name: Building from source
+    - name: Build from source
       id: build_freebsd
       uses: vmactions/freebsd-vm@v1
       with:

.github/workflows/build_linux.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
-    - name: Building from source
+    - name: Build from source
       env:
         CC: ${{ matrix.compiler }}
       run: |
@@ -54,7 +54,7 @@ jobs:
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
-    - name: Building from source
+    - name: Build from source
       env:
         CC: ${{ matrix.compiler }}
       run: |
@@ -81,45 +81,11 @@ jobs:
     - name: Prepare shared libraries
       run: |
         tests/syncsharedlibs.sh --use-head
-    - name: Building from source
+    - name: Build from source
       env:
         CC: ${{ matrix.compiler }}
       run: |
         tests/build.sh ${{ matrix.configure_options }}
     - name: Run tests
       run: |
         tests/runtests.sh
-  coverage:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-        - os: ubuntu-24.04
-          compiler: 'gcc'
-          configure_options: 'CPPFLAGS=-DHAVE_MEMORY_TESTS=1 --enable-code-coverage'
-    steps:
-    - uses: actions/checkout@v6
-    - name: Install build dependencies
-      run: |
-        sudo apt -y install curl autoconf automake autopoint build-essential git libtool pkg-config
-    - name: Download test data
-      run: |
-        if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
-    - name: Building from source
-      env:
-        CC: ${{ matrix.compiler }}
-      run: |
-        tests/build.sh ${{ matrix.configure_options }}
-    - name: Run tests
-      run: |
-        make check CHECK_WITH_STDERR=1 SKIP_TOOLS_END_TO_END_TESTS=1
-    - name: Generate coverage data
-      run: |
-        for DIRECTORY in `find . -maxdepth 1 -type d`; do \
-          (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) \
-        done
-    - name: Upload coverage report to Codecov
-      uses: codecov/codecov-action@v6
-      with:
-        name: ${{ matrix.os }}-gcc-no-optimization
-        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/build_macos.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
-    - name: Building from source
+    - name: Build from source
       run: |
         tests/build.sh ${{ matrix.configure_options }}
     - name: Run tests

.github/workflows/build_windows.yml

@@ -23,11 +23,70 @@ jobs:
     - name: Download test data
       run: |
         if (Test-Path .\synctestdata.ps1) { .\synctestdata.ps1 }
-    - name: Building from source
+    - name: Build from source
       run: |
         .\synclibs.ps1 -UseHead
         .\autogen.ps1
         .\build.ps1 -VisualStudioVersion 2022 -Configuration Release -Platform x64 -PythonPath ${{ env.pythonLocation }} -VSToolsOptions "--extend-with-x64 --no-python-dll"
     - name: Run tests
       run: |
         .\runtests.ps1
+  build_cygwin:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        include:
+        - configure_options: '--enable-winapi=no'
+        - configure_options: '--enable-winapi=yes'
+    steps:
+    - name: Configure git
+      run: git config --global core.autocrlf false
+    - uses: actions/checkout@v6
+    - name: Install Cygwin and build dependencies
+      uses: cygwin/cygwin-install-action@v6
+      with:
+        packages: autoconf, automake, gettext-devel, git, libtool, make, mingw-w64-x86_64-gcc, pkg-config
+        platform: x86_64
+        add-to-path: true
+    - name: Build from source
+      shell: bash --login -e -o pipefail -o igncr {0}
+      working-directory: ${{ github.workspace }}
+      env:
+        CHERE_INVOKING: 1
+        CONFIGURE_OPTIONS: ${{ matrix.configure_options }}
+        LD: ld
+      run: |
+        if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
+        tests/build.sh ${CONFIGURE_OPTIONS}
+    - name: Run tests
+      shell: bash --login -e -o pipefail -o igncr {0}
+      working-directory: ${{ github.workspace }}
+      env:
+        CHERE_INVOKING: 1
+      run: |
+        tests/runtests.sh
+  build_mingw:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        include:
+        - configure_options: ''
+    steps:
+    - uses: actions/checkout@v6
+    - name: Set up MSYS2 with MinGW-w64
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW64
+        update: true
+        install: autoconf automake gettext gettext-devel libtool make mingw-w64-x86_64-gcc pkg-config
+    - name: Build from source
+      shell: msys2 {0}
+      env:
+        CONFIGURE_OPTIONS: ${{ matrix.configure_options }}
+      run: |
+        if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
+        tests/build.sh ${CONFIGURE_OPTIONS}
+    - name: Run tests
+      shell: msys2 {0}
+      run: |
+        tests/runtests.sh

.github/workflows/check_source.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
-    - name: Building from source
+    - name: Build from source
       env:
         CC: ${{ matrix.compiler }}
       run: |
@@ -48,7 +48,7 @@ jobs:
     - name: Install build dependencies
       run: |
         sudo apt -y install autoconf automake autopoint build-essential clang clang-tools git jq libtool pkg-config
-    - name: Building from source
+    - name: Build from source
       env:
         CC: ${{ matrix.compiler }}
       run: |
@@ -111,7 +111,7 @@ jobs:
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
-    - name: Building from source
+    - name: Build from source
       env:
         CC: ${{ matrix.compiler }}
       run: |

appveyor.yml

@@ -91,38 +91,12 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
     HOMEBREW_NO_INSTALL_CLEANUP: 1
     CONFIGURE_OPTIONS: "--disable-dependency-tracking --prefix=/usr/local --with-pyprefix"
-  - TARGET: cygwin64-gcc
-    BUILD_ENVIRONMENT: cygwin64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    CONFIGURE_OPTIONS: ""
-  - TARGET: cygwin64-gcc-no-optimization
-    BUILD_ENVIRONMENT: cygwin64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    CONFIGURE_OPTIONS: "--enable-code-coverage"
-  - TARGET: mingw-w64-gcc
-    BUILD_ENVIRONMENT: mingw-w64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    CONFIGURE_OPTIONS: ""
-  - TARGET: mingw-w64-gcc-no-optimization
-    BUILD_ENVIRONMENT: mingw-w64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    CONFIGURE_OPTIONS: "--enable-code-coverage"
 
 install:
 - cmd: if [%BUILD_ENVIRONMENT%]==[msbuild] (
     git clone https://github.com/libyal/vstools.git ..\vstools )
 - sh: if test ${BUILD_ENVIRONMENT} = "xcode"; then brew untap homebrew/homebrew-cask-versions && brew update -q; fi
 - sh: if test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true; fi
-- ps: If ($env:BUILD_ENVIRONMENT -eq "cygwin64") {
-    Invoke-WebRequest -Uri "https://cygwin.com/setup-x86_64.exe" -Outfile C:\cygwin64\setup-x86_64.exe }
-- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
-    C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P gettext-devel )
-- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
-    git clone git://git.savannah.gnu.org/config.git ..\config )
-- cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
-    C:\msys64\usr\bin\pacman -S --noconfirm --needed autoconf automake gettext-devel libtool make mingw-w64-x86_64-gcc pkg-config )
-- ps: If (("cygwin64-gcc-no-optimization", "mingw-w64-gcc-no-optimization").Contains($env:TARGET)) {
-    Invoke-WebRequest -Uri "https://uploader.codecov.io/latest/windows/codecov.exe" -Outfile ..\codecov.exe }
 
 build_script:
 - ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild") {
@@ -135,30 +109,11 @@ build_script:
 - ps: If (("vs2017", "vs2019", "vs2022", "vs2022-vsdebug", "vs2022-x64").Contains($env:TARGET)) {
     .\build.ps1 -VisualStudioVersion $env:TARGET.Substring(2, 4) -Configuration $env:CONFIGURATION -Platform $env:PLATFORM -PythonPath $env:PYTHON_PATH -VSToolsOptions "--extend-with-x64 --no-python-dll --with-dokany" }
 - sh: if test ${BUILD_ENVIRONMENT} = "xcode"; then export PATH="/usr/local/opt/gettext/bin:$PATH"; export SED="/usr/local/bin/gsed"; tests/build.sh ${CONFIGURE_OPTIONS}; fi
-- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
-    xcopy /i /q /s C:\projects\libcthreads C:\cygwin64\home\appveyor\libcthreads &&
-    xcopy /i /q ..\config\config.* C:\cygwin64\home\appveyor\libcthreads &&
-    C:\cygwin64\bin\bash -e -l -c "cd libcthreads && tests/build.sh ${CONFIGURE_OPTIONS}" )
-- cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
-    xcopy /i /q /s C:\projects\libcthreads C:\msys64\home\appveyor\libcthreads &&
-    C:\msys64\usr\bin\bash -e -l -c "cd libcthreads && tests/build.sh ${CONFIGURE_OPTIONS}" )
 
 test_script:
 - cmd: rem Run tests
 - ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild") {
     .\runtests.ps1 }
 - sh: if test ${BUILD_ENVIRONMENT} = "xcode" && test ${TARGET} != "macos-pkgbuild"; then tests/runtests.sh; fi
 - sh: if test ${TARGET} = "macos-pkgbuild"; then tests/pkgbuild.sh; fi
-- cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
-    C:\cygwin64\bin\bash -l -c "cd libcthreads && tests/runtests.sh" )
-- cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
-    C:\msys64\usr\bin\bash -l -c "cd libcthreads && tests/runtests.sh" )
-
-after_test:
-- cmd: if [%TARGET%]==[cygwin64-gcc-no-optimization] (
-    C:\cygwin64\bin\bash -e -l -c "cd libcthreads && for DIRECTORY in `find . -maxdepth 1 -type d`; do (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) done" &&
-    C:\projects\codecov.exe -R \cygwin64\home\appveyor\libcthreads --name %TARGET% )
-- cmd: if [%TARGET%]==[mingw-w64-gcc-no-optimization] (
-    C:\msys64\usr\bin\bash -e -l -c "cd libcthreads && for DIRECTORY in `find . -maxdepth 1 -type d`; do (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) done" &&
-    C:\projects\codecov.exe -R \msys64\home\appveyor\libcthreads --name %TARGET% )
 

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
   [libcthreads],
-  [20260528],
+  [20260529],
   [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(
@@ -44,6 +44,15 @@ AC_SYS_LARGEFILE
 dnl Check if shared library support should be disabled
 AX_COMMON_CHECK_DISABLE_SHARED_LIBS
 
+dnl Check if asan support should be enabled
+AX_TESTS_CHECK_ENABLE_ASAN
+
+dnl Check if ubsan support should be enabled
+AX_TESTS_CHECK_ENABLE_UBSAN
+
+dnl Check if code coverage support should be enabled
+AX_TESTS_CHECK_ENABLE_CODE_COVERAGE
+
 dnl Check if WINAPI support should be enabled
 AX_COMMON_CHECK_ENABLE_WINAPI
 
@@ -62,18 +71,8 @@ AX_LIBCTHREADS_CHECK_LOCAL
 dnl Check if DLL support is needed
 AX_LIBCTHREADS_CHECK_DLL_SUPPORT
 
-dnl Check if asan support should be enabled
-AX_TESTS_CHECK_ENABLE_ASAN
-
-dnl Check if ubsan support should be enabled
-AX_TESTS_CHECK_ENABLE_UBSAN
-
-dnl Check if code coverage support should be enabled
-AX_TESTS_CHECK_ENABLE_CODE_COVERAGE
-
 dnl Check if tests required headers and functions are available
 AX_TESTS_CHECK_LOCAL
-AX_TESTS_CHECK_PTHREAD_RWLOCK_UNLOCK_HOOK
 
 dnl Set additional compiler flags
 CFLAGS="$CFLAGS -Wall";

libcthreads/libcthreads.c

@@ -37,6 +37,8 @@
 #pragma managed( push, off )
 #endif
 
+/* LCOV_EXCL_START */
+
 /* Defines the entry point for the DLL
  */
 BOOL WINAPI DllMain(
@@ -65,6 +67,8 @@ BOOL WINAPI DllMain(
 	return( TRUE );
 }
 
+/* LCOV_EXCL_STOP */
+
 /* Function that indicates the library is a DLL
  * Returns 1
  */

m4/common.m4

@@ -1,6 +1,6 @@
 dnl Checks for common headers and functions
 dnl
-dnl Version: 20260528
+dnl Version: 20260529
 
 dnl Function to test if a certain feature was disabled
 AC_DEFUN([AX_COMMON_ARG_DISABLE],
@@ -79,7 +79,7 @@ AC_DEFUN([AX_COMMON_CHECK_DISABLE_SHARED_LIBS],
   [AX_COMMON_ARG_DISABLE(
     [shared-libs],
     [shared_libs],
-    [disable shared library support])
+    [shared library support])
   ])
 
 dnl Function to detect whether debug output should be enabled
@@ -151,7 +151,7 @@ AC_DEFUN([AX_COMMON_CHECK_ENABLE_WINAPI],
   [AX_COMMON_ARG_ENABLE(
     [winapi],
     [winapi],
-    [enable WINAPI support for cross-compilation],
+    [WINAPI support for cross-compilation],
     [auto-detect])
 
   AS_IF(

m4/tests.m4

@@ -1,6 +1,6 @@
 dnl Functions for testing
 dnl
-dnl Version: 20260528
+dnl Version: 20260529
 
 dnl Function to check whether libasan is functional
 AC_DEFUN([AX_TESTS_CHECK_LIBASAN],
@@ -76,7 +76,7 @@ AC_DEFUN([AX_TESTS_CHECK_ENABLE_ASAN],
   [AX_COMMON_ARG_ENABLE(
     [asan],
     [asan],
-    [build with asan)],
+    [build with asan],
     [no])
 
   AS_IF(
@@ -100,7 +100,7 @@ AC_DEFUN([AX_TESTS_CHECK_ENABLE_UBSAN],
   [AX_COMMON_ARG_ENABLE(
     [ubsan],
     [ubsan],
-    [build with ubsan)],
+    [build with ubsan],
     [no])
 
   AS_IF(