From 7b21a0620b2b5d29781fd8b31266657e33d7575e Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Thu, 28 Mar 2024 20:21:11 +0100
Subject: [PATCH] CI updates

---
 .github/workflows/ci.yml | 12 +++---------
 CMakeLists.txt           |  5 +++--
 Makefile                 |  2 +-
 src/Makefile             |  3 ++-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88b97bc9..6a02256d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,8 @@ env:
   UPX_CMAKE_BUILD_FLAGS: --verbose
   UPX_CMAKE_CONFIG_FLAGS: -Wdev --warn-uninitialized
   UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO: 1
-  # 2024-03-23
-  ZIG_DIST_VERSION: 0.12.0-dev.3429+13a9d94a8
+  # 2024-03-28
+  ZIG_DIST_VERSION: 0.12.0-dev.3480+9dac8db2d
 
 jobs:
   job-rebuild-and-verify-stubs:
@@ -71,8 +71,6 @@ jobs:
         include:
           - { os: ubuntu-22.04, use_m32: true }
           - { os: ubuntu-20.04, use_m32: true } # use_m32 also works here, but save some CI time
-    env:
-      UPX_CONFIG_EXPECT_THREADS: 'ON'
     steps:
       - name: 'Install extra 32-bit and Windows packages'
         if: ${{ matrix.use_m32 }}
@@ -171,6 +169,7 @@ jobs:
         run: |
           env -C build/extra/gcc/release bash "$PWD"/misc/testsuite/test_symlinks.sh
       - name: 'Run file system test suite with Valgrind'
+        if: false # valgrind is SLOW
         run: |
           if command -v valgrind >/dev/null; then
             export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet --gen-suppressions=all"
@@ -199,8 +198,6 @@ jobs:
           # { os: macos-14, gcc: gcc-13, gxx: 'g++-13', testsuite: true }                        # gcc-13: INTERNAL ERROR in ld64
           # { os: macos-14, gcc: gcc-13, gxx: 'g++-13', testsuite: true, xcode_version: 14.3.1 } # gcc-13: MISSING HEADER FILES
           - { os: macos-14, gcc: gcc-12, gxx: 'g++-12', testsuite: true } # => use gcc-12 for now
-    env:
-      UPX_CONFIG_EXPECT_THREADS: 'ON'
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
         if: matrix.xcode_version # NOTE: gcc-12 on macos-13 does not work with Xcode-15
@@ -297,8 +294,6 @@ jobs:
         include:
           - { name: windows-2019-amd64, os: windows-2019, vsversion: 2019, arch: amd64 }
           - { name: windows-2022-amd64, os: windows-2022, vsversion: 2022, arch: amd64 }
-    env:
-      UPX_CONFIG_EXPECT_THREADS: 'ON'
     steps:
       - run: git config --global core.autocrlf false
       - name: 'Check out code'
@@ -487,7 +482,6 @@ jobs:
           # { zig_target: x86_64-macos.13.0-none }
           - { zig_target: x86_64-windows-gnu }
     env:
-      ##UPX_CONFIG_EXPECT_THREADS: 'ON'
       # zig is currently missing winpthreads; see https://github.com/ziglang/zig/issues/10989
       UPX_CONFIG_EXPECT_THREADS: ${{ contains(matrix.zig_target, '-windows-') && 'OFF' || 'ON' }}
       # for zig-cc wrapper scripts (see below):
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5a25a35..b1cee4b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,13 +78,14 @@ upx_cache_bool_vars(ON
     CMAKE_C_STANDARD_REQUIRED CMAKE_CXX_STANDARD_REQUIRED
     CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_REQUIRED_QUIET
 )
-# internal UPX settings that default to OFF
+# internal UPX settings
 upx_cache_bool_vars(OFF
     UPX_CONFIG_CMAKE_DISABLE_TEST UPX_CONFIG_CMAKE_DISABLE_INSTALL
     UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO UPX_CONFIG_CMAKE_DISABLE_PLATFORM_CHECK
     UPX_CONFIG_DISABLE_C_STANDARD UPX_CONFIG_DISABLE_CXX_STANDARD
-    UPX_CONFIG_EXPECT_THREADS UPX_CONFIG_REQUIRE_THREADS
+    UPX_CONFIG_REQUIRE_THREADS
 )
+upx_cache_bool_vars(ON UPX_CONFIG_EXPECT_THREADS)
 upx_print_env_var(CC CXX)
 
 # determine Git revision
diff --git a/Makefile b/Makefile
index db840c2f..2da65e3b 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ endif
 test:: build/all+test PHONY
 ifneq ($(wildcard /usr/bin/env),) # need Unix utils like bash, perl, sed, xargs, etc.
 ifneq ($(wildcard ./misc/scripts/.),)
-check-whitespace clang-format run-testsuite run-testsuite-debug run-testsuite-release: src/Makefile PHONY
+check-whitespace clang-format run-testsuite run-testsuite-all run-testsuite-debug run-testsuite-release: src/Makefile PHONY
 	$(MAKE) -C src $@
 endif
 endif
diff --git a/src/Makefile b/src/Makefile
index 189be688..c7ebc97a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -59,7 +59,8 @@ endif
 # The   actual (new) checksums are in ./tmp-upx-testsuite-*/testsuite_1/.sha256sums.recreate
 ifneq ($(wildcard $(upx_testsuite_SRCDIR)/files/packed/.),)
 ifneq ($(wildcard $(top_srcdir)/misc/testsuite/upx_testsuite_1.sh),)
-run-testsuite: run-testsuite-release PHONY
+run-testsuite:     run-testsuite-release PHONY
+run-testsuite-all: run-testsuite-debug run-testsuite-release PHONY
 run-testsuite-%: export upx_testsuite_SRCDIR := $(upx_testsuite_SRCDIR)
 run-testsuite-debug: export upx_testsuite_BUILDDIR := ./tmp-upx-testsuite-debug
 run-testsuite-debug: export upx_exe := $(top_srcdir)/build/debug/upx