Get references to generated pwait binary working

.github/workflows/build-and-test.yml

@@ -22,13 +22,6 @@ jobs:
         c_compiler:
         - gcc
         - clang
-        include:
-        - os: ubuntu-latest
-          c_compiler: gcc
-          cpp_compiler: g++
-        - os: ubuntu-latest
-          c_compiler: clang
-          cpp_compiler: clang++
 
     steps:
     - uses: actions/checkout@v4
@@ -51,7 +44,6 @@ jobs:
       run: >
         cmake
         -B ${{steps.strings.outputs.build-output-dir}}
-        -DCMAKE_CXX_COMPILER=${{matrix.cpp_compiler}}
         -DCMAKE_C_COMPILER=${{matrix.c_compiler}}
         -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
         -S ${{github.workspace}}

CMakeLists.txt

@@ -1,6 +1,6 @@
-project(pwait)
+cmake_minimum_required(VERSION 3.15)
 
-cmake_minimum_required(VERSION 2.8)
+project(pwait)
 
 enable_testing()
 

src/CMakeLists.txt

@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.15)
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include(CheckSymbolExists)
@@ -7,12 +9,5 @@ configure_file(config.h.in config.h)
 add_executable(pwait pwait.c)
 target_link_libraries(pwait cap)
 
-add_custom_target(
-    pwait-setcap
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND sudo setcap cap_sys_ptrace+ep "${CMAKE_CURRENT_BINARY_DIR}/pwait"
-)
-add_dependencies(pwait-setcap pwait)
-
 install(TARGETS pwait RUNTIME DESTINATION bin)
 install(CODE "execute_process(COMMAND sudo setcap cap_sys_ptrace+ep pwait WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)")

test/CMakeLists.txt

@@ -1,4 +1,14 @@
+cmake_minimum_required(VERSION 3.22)
+
 add_test(
-    NAME test_pwait
+    NAME pwait-setcap
+    COMMAND sudo setcap cap_sys_ptrace+ep "$<TARGET_FILE:pwait>"
+)
+set_tests_properties(pwait-setcap PROPERTIES FIXTURES_SETUP pwait-setcap-fixture)
+
+add_test(
+    NAME test-pwait
     COMMAND "${CMAKE_CURRENT_LIST_DIR}/test_pwait.sh"
 )
+set_tests_properties(test-pwait PROPERTIES ENVIRONMENT PWAIT=$<TARGET_FILE:pwait>)
+set_tests_properties(test-pwait PROPERTIES FIXTURES_REQUIRED pwait-setcap-fixture)

test/test_pwait.sh

@@ -22,9 +22,9 @@ start_sleep_and_exit() {
 # and then store pwait's exit code in the variable pwait_exit_code.
 run_pwait() {
     local pid="${1?:Missing PID}"
-    printf "Invoking pwait on target pid %d\n" "$pid"
+    printf "Invoking %s on target pid %d\n" "$PWAIT" "$pid"
     set +e
-    pwait "$pid"
+    "$PWAIT" "$pid"
     pwait_exit_code="$?"
     set -e
 }
@@ -118,7 +118,7 @@ test_pwait_and_target_exit_times() {
     trap "rm -rf '$tmpdir'" RETURN
     ( /usr/bin/time --format "%e" sleep "$delay" >"$tmpdir/sleep-time.txt" ) &
     background_pid="$!"
-    /usr/bin/time --format "%e" pwait "$background_pid" >"$tmpdir/pwait-time.txt"
+    /usr/bin/time --format "%e" "$PWAIT" "$background_pid" >"$tmpdir/pwait-time.txt"
 
     assert "cmp '$tmpdir/sleep-time.txt' '$tmpdir/pwait-time.txt'" "pwait and target process finished at different times"