CI updates

Logan-lu · Nov 14, 2023 · f74c225 · f74c225
1 parent c479fe3
commit f74c225
Show file tree

Hide file tree

Showing 28 changed files with 228 additions and 162 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,8 +9,9 @@ name: 'CI'
 on: [push, workflow_dispatch]
 
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
  UPX_CMAKE_BUILD_FLAGS: --verbose
  # 2023-11-08
@@ -157,7 +158,7 @@ jobs:
  run: |
  # testsuite needs working "readlink -en" and "sha256sum -b"
  if ! test -e /usr/local/opt/coreutils/libexec/gnubin/readlink; then
- echo "===== brew leaves:"; brew leaves; echo "===== brew list:"; brew list
+ echo "===== brew leaves:"; brew leaves; echo "===== brew list:"; brew list --versions
  # only run "brew update" if needed
  if ! brew install coreutils; then brew update && brew install coreutils; fi
  fi

diff --git a/.github/workflows/static-analyzer-clang-analyzer.yml b/.github/workflows/static-analyzer-clang-analyzer.yml
@@ -5,8 +5,9 @@ on:
  schedule: [cron: '10 4 * * 3'] # run weekly Wednesday 04:10 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/static-analyzer-clang-tidy.yml b/.github/workflows/static-analyzer-clang-tidy.yml
@@ -5,8 +5,9 @@ on:
  schedule: [cron: '30 4 * * 3'] # run weekly Wednesday 04:30 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/static-analyzer-codeql.yml b/.github/workflows/static-analyzer-codeql.yml
@@ -5,8 +5,9 @@ on:
  schedule: [cron: '50 4 * * 3'] # run weekly Wednesday 04:50 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/test-alpine-linux.yml b/.github/workflows/test-alpine-linux.yml
@@ -6,8 +6,9 @@
 name: 'Test - Minimal Alpine build'
 on: [workflow_dispatch]
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/test-cmake-default.yml b/.github/workflows/test-cmake-default.yml
@@ -3,8 +3,9 @@
 name: 'Test - CMake default build type'
 on: [workflow_dispatch]
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/test-unused.yml b/.github/workflows/test-unused.yml
@@ -3,8 +3,9 @@
 name: 'Test - Unused'
 on: [workflow_dispatch]
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/test-yaml-check.yml b/.github/workflows/test-yaml-check.yml
@@ -3,8 +3,9 @@
 name: 'Test - YAML check'
 on: [workflow_dispatch]
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/weekly-ci-bs-by-hand.yml b/.github/workflows/weekly-ci-bs-by-hand.yml
@@ -6,8 +6,9 @@ on:
  schedule: [cron: '00 1 * * 3'] # run weekly Wednesday 01:00 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
  VERBOSE: 1
 

diff --git a/.github/workflows/weekly-ci-bs-cmake-macos-xcode.yml b/.github/workflows/weekly-ci-bs-cmake-macos-xcode.yml
@@ -6,8 +6,9 @@ on:
  schedule: [cron: '10 1 * * 3'] # run weekly Wednesday 01:10 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-make.yml b/.github/workflows/weekly-ci-bs-cmake-windows-make.yml
@@ -6,8 +6,9 @@ on:
  schedule: [cron: '20 1 * * 3'] # run weekly Wednesday 01:20 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
  UPX_CMAKE_BUILD_FLAGS: --verbose
  UPX_CMAKE_CONFIG_FLAGS: -G "Unix Makefiles"

diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml b/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml
@@ -6,8 +6,9 @@ on:
  schedule: [cron: '30 1 * * 3'] # run weekly Wednesday 01:30 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
  UPX_CMAKE_BUILD_FLAGS: --verbose
  UPX_CMAKE_CONFIG_FLAGS: -G Ninja

diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-nmake.yml b/.github/workflows/weekly-ci-bs-cmake-windows-nmake.yml
@@ -6,8 +6,9 @@ on:
  schedule: [cron: '40 1 * * 3'] # run weekly Wednesday 01:40 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:
@@ -43,7 +44,7 @@ jobs:
  shell: cmd
  run: |
  set X=${{ matrix.clang_cl && '-DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl' || '' }}
- cmake -S . -B build/debug -G "NMake Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug %X%
+ cmake -S . -B build/debug -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Debug %X%
  cd build/debug
  nmake
  dir *.exe
@@ -52,7 +53,7 @@ jobs:
  shell: cmd
  run: |
  set X=${{ matrix.clang_cl && '-DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl' || '' }}
- cmake -S . -B build/release -G "NMake Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON %X%
+ cmake -S . -B build/release -G "NMake Makefiles" %X%
  cd build/release
  nmake
  dir *.exe

diff --git a/.github/workflows/weekly-ci-bs-misc.yml b/.github/workflows/weekly-ci-bs-misc.yml
@@ -6,8 +6,9 @@ on:
  schedule: [cron: '50 1 * * 3'] # run weekly Wednesday 01:50 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
  UPX_CMAKE_BUILD_FLAGS: --verbose
 

diff --git a/.github/workflows/weekly-ci-cc-alpine-linux.yml b/.github/workflows/weekly-ci-cc-alpine-linux.yml
@@ -15,10 +15,10 @@ on:
  schedule: [cron: '00 2 * * 3'] # run weekly Wednesday 02:00 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
- UPX_CMAKE_CONFIG_FLAGS: -DCMAKE_VERBOSE_MAKEFILE=ON
  UPX_TESTSUITE_LEVEL: 4
 
 jobs:

diff --git a/.github/workflows/weekly-ci-cc-alpine-mingw.yml b/.github/workflows/weekly-ci-cc-alpine-mingw.yml
@@ -6,10 +6,10 @@ on:
  schedule: [cron: '20 2 * * 3'] # run weekly Wednesday 02:20 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
- UPX_CMAKE_CONFIG_FLAGS: -DCMAKE_VERBOSE_MAKEFILE=ON
 
 jobs:
  job-alpine-mingw: # uses cmake + make

diff --git a/.github/workflows/weekly-ci-cc-llvm-mingw.yml b/.github/workflows/weekly-ci-cc-llvm-mingw.yml
@@ -8,10 +8,10 @@ on:
  schedule: [cron: '30 2 * * 3'] # run weekly Wednesday 02:30 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
- UPX_CMAKE_CONFIG_FLAGS: -DCMAKE_VERBOSE_MAKEFILE=ON
 
 jobs:
  job-llvm-mingw: # uses cmake + make

diff --git a/.github/workflows/weekly-ci-cc-zigcc.yml b/.github/workflows/weekly-ci-cc-zigcc.yml
@@ -8,8 +8,9 @@ on:
  schedule: [cron: '40 2 * * 3'] # run weekly Wednesday 02:40 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
  # 2023-11-08
  ZIG_DIST_VERSION: 0.12.0-dev.1502+b3462b7ce

diff --git a/.github/workflows/weekly-ci-rt-checkers.yml b/.github/workflows/weekly-ci-rt-checkers.yml
@@ -8,8 +8,9 @@ on:
  schedule: [cron: '00 3 * * 3'] # run weekly Wednesday 03:00 UTC
  workflow_dispatch:
 env:
- CMAKE_REQUIRED_QUIET: "OFF"
- CTEST_OUTPUT_ON_FAILURE: "ON"
+ CMAKE_REQUIRED_QUIET: 'OFF'
+ CMAKE_VERBOSE_MAKEFILE: 'ON'
+ CTEST_OUTPUT_ON_FAILURE: 'ON'
  DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,6 +119,10 @@ upx_cache_bool_vars(ON
  CMAKE_C_STANDARD_REQUIRED CMAKE_CXX_STANDARD_REQUIRED
  CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_REQUIRED_QUIET
 )
+# global CMake settings that default to OFF
+upx_cache_bool_vars(OFF
+ CMAKE_VERBOSE_MAKEFILE
+)
 # internal UPX settings that default to OFF
 upx_cache_bool_vars(OFF
  UPX_CONFIG_CMAKE_DISABLE_TEST UPX_CONFIG_CMAKE_DISABLE_INSTALL
@@ -418,6 +422,20 @@ upx_cmake_include_hook(4_targets_begin)
 if(NOT UPX_CONFIG_DISABLE_THREADS)
  find_package(Threads)
 endif()
+# make sure that threads are indeed fully supported
+if(Threads_FOUND)
+ foreach(f std_lock_guard.cpp)
+ set(CMAKE_TRY_COMPILE_TARGET_TYPE "EXECUTABLE")
+ try_compile(result "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/try_compile/${f}"
+ OUTPUT_VARIABLE output)
+ if(NOT result)
+ #message(STATUS "${output}") # debug output from try_compile
+ set(Threads_FOUND OFF)
+ break()
+ endif()
+ endforeach()
+endif()
 
 if(NOT UPX_CONFIG_DISABLE_BZIP2)
 upx_add_glob_files(bzip2_SOURCES "vendor/bzip2/*.c")
@@ -573,22 +591,21 @@ upx_cmake_include_hook(6_test)
 
 if(NOT UPX_CONFIG_CMAKE_DISABLE_TEST)
 
+function(upx_add_test)
+ set(name "${ARGV0}")
+ list(REMOVE_AT ARGV 0)
+ add_test(NAME "${name}" COMMAND ${ARGV})
+ set_tests_properties("${name}" PROPERTIES RUN_SERIAL TRUE) # run these tests sequentially
+endfunction()
+
 include(CTest)
-# TODO later: check CMAKE_CROSSCOMPILING_EMULATOR
-if(NOT CMAKE_CROSSCOMPILING)
+if(NOT CMAKE_CROSSCOMPILING OR CMAKE_CROSSCOMPILING_EMULATOR)
  add_test(NAME upx-version COMMAND upx --version)
  add_test(NAME upx-help COMMAND upx --help)
  add_test(NAME upx-sysinfo COMMAND upx --sysinfo -v)
-endif()
-if(NOT CMAKE_CROSSCOMPILING AND NOT UPX_CONFIG_DISABLE_SELF_PACK_TEST)
+if(NOT UPX_CONFIG_DISABLE_SELF_PACK_TEST)
  # IMPORTANT NOTE: these tests can only work if the host executable format is supported by UPX!
- function(upx_add_test)
- set(name "${ARGV0}")
- list(REMOVE_AT ARGV 0)
- add_test(NAME "${name}" COMMAND ${ARGV})
- set_tests_properties("${name}" PROPERTIES RUN_SERIAL TRUE) # run these tests sequentially
- endfunction()
- set(exe ${CMAKE_EXECUTABLE_SUFFIX})
+ set(exe "${CMAKE_EXECUTABLE_SUFFIX}")
  set(upx_self_exe "$<TARGET_FILE:upx>")
  set(fo "--force-overwrite")
  upx_add_test(upx-self-pack upx -3 "${upx_self_exe}" ${fo} -o upx-packed${exe})
@@ -600,8 +617,9 @@ if(NOT CMAKE_CROSSCOMPILING AND NOT UPX_CONFIG_DISABLE_SELF_PACK_TEST)
  upx_add_test(upx-fileinfo upx --fileinfo upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe})
  upx_add_test(upx-test upx -t upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe})
  upx_add_test(upx-unpack upx -d upx-packed${exe} ${fo} -o upx-unpacked${exe})
- upx_add_test(upx-run-unpacked ./upx-unpacked${exe} --version-short)
- upx_add_test(upx-run-packed ./upx-packed${exe} --version-short)
+ upx_add_test(upx-run-unpacked ${CMAKE_CROSSCOMPILING_EMULATOR} ./upx-unpacked${exe} --version-short)
+ upx_add_test(upx-run-packed ${CMAKE_CROSSCOMPILING_EMULATOR} ./upx-packed${exe} --version-short)
+endif() # UPX_CONFIG_DISABLE_SELF_PACK_TEST
 endif()
 
 endif() # UPX_CONFIG_CMAKE_DISABLE_TEST
@@ -646,13 +664,16 @@ upx_cmake_include_hook(8_summary)
 print_var(CMAKE_VERSION UPX_CONFIG_CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_GENERATOR)
 if(NOT UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO)
 print_var(CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_VERSION)
-print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_CROSSCOMPILING)
+print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR)
 print_var(CMAKE_C_COMPILER_ID CMAKE_C_COMPILER_VERSION CMAKE_C_COMPILER_FRONTEND_VARIANT CMAKE_C_COMPILER_ARCHITECTURE_ID CMAKE_C_PLATFORM_ID CMAKE_C_COMPILER_ABI)
 print_var(CMAKE_CXX_COMPILER_ID CMAKE_CXX_COMPILER_VERSION CMAKE_CXX_COMPILER_FRONTEND_VARIANT CMAKE_CXX_COMPILER_ARCHITECTURE_ID CMAKE_CXX_PLATFORM_ID CMAKE_CXX_COMPILER_ABI)
-print_var(CMAKE_CROSSCOMPILING_EMULATOR CMAKE_INTERPROCEDURAL_OPTIMIZATION CMAKE_POSITION_INDEPENDENT_CODE CMAKE_TRY_COMPILE_CONFIGURATION)
+print_var(CMAKE_INTERPROCEDURAL_OPTIMIZATION CMAKE_POSITION_INDEPENDENT_CODE CMAKE_TRY_COMPILE_CONFIGURATION)
 print_var(CYGWIN GNUC MINGW MSVC MSVC_FRONTEND MSVC_IDE WIN32 WIN64)
 endif() # UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO
 print_var(CMAKE_INSTALL_PREFIX CMAKE_CONFIGURATION_TYPES CMAKE_BUILD_TYPE)
+if(Threads_FOUND)
+ message(STATUS "WITH_THREADS = 1")
+endif()
 if(CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|None|Release)$")
  message(WARNING "WARNING: unsupported CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}; please use \"Debug\" or \"Release\"")
 endif()

diff --git a/Makefile b/Makefile
@@ -63,6 +63,8 @@ include ./misc/make/Makefile-extra.mk
 endif
 
 # developer convenience
+test: $(.DEFAULT_GOAL)
+ cd $(.DEFAULT_GOAL) && ctest
 ifneq ($(wildcard /usr/bin/env),) # needs bash, perl, xargs, etc.
 check-whitespace clang-format run-testsuite run-testsuite-debug run-testsuite-release: PHONY src/Makefile
  $(MAKE) -C src $@

diff --git a/misc/cmake/try_compile/std_lock_guard.cpp b/misc/cmake/try_compile/std_lock_guard.cpp
@@ -0,0 +1,10 @@
+// Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+#include <mutex>
+
+static std::mutex lock_mutex;
+
+int main() {
+ std::lock_guard<std::mutex> lock(lock_mutex);
+ return 0;
+}