From 473ed391cfc5ec032644176fbe4aebf51dcf463d Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Mon, 2 Nov 2026 10:22:45 -0600 Subject: [PATCH 1/9] Added script to run reactor tests on windows Assumes that CFEngine build is installed in the normal location: c:\Program Files\CFEngine Ticket: none Changelog: none --- tests/reactor/lib.sh | 5 +++++ tests/reactor/run.sh | 5 +++-- tests/reactor/run_test.sh | 31 ++++++++++++++++++++++++++++--- tests/reactor/win-run.sh | 9 +++++++++ 4 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 tests/reactor/win-run.sh diff --git a/tests/reactor/lib.sh b/tests/reactor/lib.sh index e938ea23a78..caa87a5c15f 100644 --- a/tests/reactor/lib.sh +++ b/tests/reactor/lib.sh @@ -172,6 +172,11 @@ set_installed_packages() { start_reactor() { "$CF_REACTOR" --no-fork --verbose -f "$1" >>"$LOG" 2>&1 & reactor_pid=$! + echo "reactor_pid is $reactor_pid" + if grep 'error:' "$LOG"; then + stop_reactor + exit 1 + fi trap stop_reactor EXIT } diff --git a/tests/reactor/run.sh b/tests/reactor/run.sh index 8394314c5d6..4a51fd8b6b9 100644 --- a/tests/reactor/run.sh +++ b/tests/reactor/run.sh @@ -37,7 +37,7 @@ run_test() { total=$((total + 1)) start=$(now) - output=$(sh "$dir/run_test.sh" "$1" 2>&1) + sh -ex "$dir/run_test.sh" "$1" 2>&1 | tee "$1".log result=$? elapsed=$(($(now) - start)) @@ -55,10 +55,11 @@ run_test() { failures="$failures $name " echo "--- FAIL: $name (${elapsed}s)" - echo "$output" + cat "$1".log echo "---" ;; esac + rm -f "$1".log } for t in "$dir"/tests/*/*.sh "$dir"/tests/*/unsafe/*.sh; do diff --git a/tests/reactor/run_test.sh b/tests/reactor/run_test.sh index e1d78bb0135..52850548fb1 100644 --- a/tests/reactor/run_test.sh +++ b/tests/reactor/run_test.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -ex # Usage: run_test.sh TEST # @@ -40,7 +41,16 @@ REACTOR_TESTS_DIR=$(cd "$(dirname "$0")" && pwd) # Print the path of binary $1, see the usage above. find_binary() { if [ -n "$CF_BINDIR" ]; then - echo "$CF_BINDIR/$1" + if [ -x "$CF_BINDIR/$1.exe" ]; then + echo "$CF_BINDIR/$1.exe" + return + fi + if [ -x "$CF_BINDIR/$1" ]; then + echo "$CF_BINDIR/$1" + return + fi + echo "Unable to find executable for $1 in $CF_BINDIR" + exit 1 elif [ -x "$REACTOR_TESTS_DIR/../../$1/$1" ]; then # in-tree build, may be a libtool wrapper script echo "$REACTOR_TESTS_DIR/../../$1/$1" @@ -52,6 +62,7 @@ find_binary() { CF_REACTOR=${CF_REACTOR:-$(find_binary cf-reactor)} CF_PROMISES=${CF_PROMISES:-$(find_binary cf-promises)} export CF_REACTOR +export CF_PROMISES for b in "$CF_REACTOR" "$CF_PROMISES"; do if [ ! -x "$b" ]; then @@ -68,7 +79,19 @@ WORKDIR=$(mktemp -d "${TMPDIR:-/tmp}/cf-reactor-test.XXXXXX" 2>/dev/null) || { WORKDIR=$(cd "$WORKDIR" && pwd) trap 'rm -rf "$WORKDIR"' EXIT mkdir -p "$WORKDIR/bin" "$WORKDIR/tmp" -ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises" + +ext="" +if echo $CF_PROMISES | grep -q exe; then + ext=".exe"; +fi +ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises$ext" + +if [ -f "$CF_BINDIR/cf.events.dll" ]; then + ln -s "$CF_BINDIR/cf.events.dll" "$WORKDIR/bin/cf.events.dll" +fi +echo CRAIG DEBUG +ls -l "$WORKDIR"/bin + # Run a copy of the policy, keeping its path relative to lib.cf, as CFEngine # refuses to read policy files writable by group or others, which those of a @@ -86,9 +109,11 @@ LOG="$WORKDIR/reactor.log" PROMISE_NAME=$(basename "$t" .sh) export WORKDIR CFENGINE_TEST_OVERRIDE_WORKDIR LOG PROMISE_NAME -sh "$t" "$policy" > "$WORKDIR/test.log" 2>&1 +echo "--- Begin test $t ---" +bash -ex "$t" "$policy" 2>&1 | tee "$WORKDIR/test.log" result=$? if [ "$result" -ne 0 ]; then cat "$WORKDIR/test.log" fi +echo "--- End test $t with exit code $result ---" exit "$result" diff --git a/tests/reactor/win-run.sh b/tests/reactor/win-run.sh new file mode 100644 index 00000000000..82632260ae7 --- /dev/null +++ b/tests/reactor/win-run.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -ex + +export CF_BINDIR="/c/Program Files/CFEngine/bin" +dir=$(cd "$(dirname "$0")" && pwd) +export TMPDIR="$dir"/tmp +mkdir -p "$TMPDIR" + +bash -ex "$dir"/run.sh 2>&1 | tee test.log From 93f3c00b3dd76e9941edf9582c65fc5eec8389e0 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 3 Nov 2026 14:46:31 -0600 Subject: [PATCH 2/9] disable most tests, especially acceptance tests while developing windows reactor test runs --- .github/workflows/ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7886e046581..41ef96f986d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,26 +9,26 @@ on: jobs: cfengine_cli: uses: ./.github/workflows/cfengine_cli.yml - unit_tests: - needs: cfengine_cli - uses: ./.github/workflows/unit_tests.yml +# unit_tests: +# needs: cfengine_cli +# uses: ./.github/workflows/unit_tests.yml shellcheck_tests: uses: ./.github/workflows/shellcheck.yml - asan_unit_tests: - needs: unit_tests - uses: ./.github/workflows/asan_unit_tests.yml - acceptance_tests: - needs: unit_tests - uses: ./.github/workflows/acceptance_tests.yml +# asan_unit_tests: +# needs: unit_tests +# uses: ./.github/workflows/asan_unit_tests.yml +# acceptance_tests: +# needs: unit_tests +# uses: ./.github/workflows/acceptance_tests.yml reactor_tests: needs: unit_tests uses: ./.github/workflows/reactor_tests.yml - macos_unit_tests: - needs: unit_tests - uses: ./.github/workflows/macos_unit_tests.yml - static_check: - needs: unit_tests - uses: ./.github/workflows/job-static-check.yml - valgrind_check: - needs: unit_tests - uses: ./.github/workflows/job-valgrind-check.yml +# macos_unit_tests: +# needs: unit_tests +# uses: ./.github/workflows/macos_unit_tests.yml +# static_check: +# needs: unit_tests +# uses: ./.github/workflows/job-static-check.yml +# valgrind_check: +# needs: unit_tests +# uses: ./.github/workflows/job-valgrind-check.yml From 601da7fde6a94d7669220ed0c5e528fe7025d82a Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Nov 2026 16:11:14 -0600 Subject: [PATCH 3/9] revertme: just one test --- tests/reactor/run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/reactor/run.sh b/tests/reactor/run.sh index 4a51fd8b6b9..fff8059c2c6 100644 --- a/tests/reactor/run.sh +++ b/tests/reactor/run.sh @@ -62,7 +62,8 @@ run_test() { rm -f "$1".log } -for t in "$dir"/tests/*/*.sh "$dir"/tests/*/unsafe/*.sh; do +#for t in "$dir"/tests/*/*.sh "$dir"/tests/*/unsafe/*.sh; do +for t in "$dir"/tests/00_basics/001_vars.sh; do # skip the pattern itself if there are no unsafe tests [ -f "$t" ] || continue run_test "$t" From df7d9e2514f08a9b9cfd6f48e83aadd2df4149c7 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Nov 2026 16:39:48 -0600 Subject: [PATCH 4/9] validate policy first to get any errors --- tests/reactor/run_test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/reactor/run_test.sh b/tests/reactor/run_test.sh index 52850548fb1..2eef1b67304 100644 --- a/tests/reactor/run_test.sh +++ b/tests/reactor/run_test.sh @@ -109,6 +109,9 @@ LOG="$WORKDIR/reactor.log" PROMISE_NAME=$(basename "$t" .sh) export WORKDIR CFENGINE_TEST_OVERRIDE_WORKDIR LOG PROMISE_NAME +echo "--- Validate test policy $policy ---" +$CF_PROMISES -c $policy + echo "--- Begin test $t ---" bash -ex "$t" "$policy" 2>&1 | tee "$WORKDIR/test.log" result=$? From 9247e358c648ad719f3e49d7facd350dd3cf1bb0 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 6 Nov 2026 16:44:51 -0600 Subject: [PATCH 5/9] mbp13 --- tests/reactor/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/reactor/run_test.sh b/tests/reactor/run_test.sh index 2eef1b67304..a46cf10eafa 100644 --- a/tests/reactor/run_test.sh +++ b/tests/reactor/run_test.sh @@ -110,7 +110,7 @@ PROMISE_NAME=$(basename "$t" .sh) export WORKDIR CFENGINE_TEST_OVERRIDE_WORKDIR LOG PROMISE_NAME echo "--- Validate test policy $policy ---" -$CF_PROMISES -c $policy +"$CF_PROMISES" -c $policy echo "--- Begin test $t ---" bash -ex "$t" "$policy" 2>&1 | tee "$WORKDIR/test.log" From 5032321d38827e710319f7fc50f5bc413aa914f5 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Wed, 11 Nov 2026 14:37:30 -0600 Subject: [PATCH 6/9] try to determine why start_reactor fails on windows in the cf-promises -c validation step --- tests/reactor/lib.sh | 2 +- tests/reactor/run_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/reactor/lib.sh b/tests/reactor/lib.sh index caa87a5c15f..19e958de5b4 100644 --- a/tests/reactor/lib.sh +++ b/tests/reactor/lib.sh @@ -170,7 +170,7 @@ set_installed_packages() { # Start cf-reactor in the background with policy file $1, logging to $LOG. # It is stopped when the test exits. start_reactor() { - "$CF_REACTOR" --no-fork --verbose -f "$1" >>"$LOG" 2>&1 & + "$CF_REACTOR" --no-fork --debug -f "$1" >>"$LOG" 2>&1 & reactor_pid=$! echo "reactor_pid is $reactor_pid" if grep 'error:' "$LOG"; then diff --git a/tests/reactor/run_test.sh b/tests/reactor/run_test.sh index a46cf10eafa..1cc1a5a0045 100644 --- a/tests/reactor/run_test.sh +++ b/tests/reactor/run_test.sh @@ -110,7 +110,7 @@ PROMISE_NAME=$(basename "$t" .sh) export WORKDIR CFENGINE_TEST_OVERRIDE_WORKDIR LOG PROMISE_NAME echo "--- Validate test policy $policy ---" -"$CF_PROMISES" -c $policy +"$CF_PROMISES" -dc $policy echo "--- Begin test $t ---" bash -ex "$t" "$policy" 2>&1 | tee "$WORKDIR/test.log" From d49861feba65a084f2317439bec33a1810e22b65 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 13 Nov 2026 15:35:10 -0600 Subject: [PATCH 7/9] stabs in the dark for fixing windows reactor tests run --- tests/reactor/run_test.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/reactor/run_test.sh b/tests/reactor/run_test.sh index 1cc1a5a0045..693f4be885d 100644 --- a/tests/reactor/run_test.sh +++ b/tests/reactor/run_test.sh @@ -61,8 +61,10 @@ find_binary() { CF_REACTOR=${CF_REACTOR:-$(find_binary cf-reactor)} CF_PROMISES=${CF_PROMISES:-$(find_binary cf-promises)} +CF_AGENT=${CF_AGENT:-$(find_binary cf-agent)} export CF_REACTOR export CF_PROMISES +export CF_AGENT for b in "$CF_REACTOR" "$CF_PROMISES"; do if [ ! -x "$b" ]; then @@ -80,11 +82,14 @@ WORKDIR=$(cd "$WORKDIR" && pwd) trap 'rm -rf "$WORKDIR"' EXIT mkdir -p "$WORKDIR/bin" "$WORKDIR/tmp" -ext="" -if echo $CF_PROMISES | grep -q exe; then - ext=".exe"; -fi -ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises$ext" +#ext="" +#if echo $CF_PROMISES | grep -q exe; then +# ext=".exe"; +#fi +#ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises$ext" +ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises" +ln -s "$CF_REACTOR" "$WORKDIR/bin/cf-reactor" +ln -s "$CF_AGENT" "WORKDIR/bin/cf-agent" if [ -f "$CF_BINDIR/cf.events.dll" ]; then ln -s "$CF_BINDIR/cf.events.dll" "$WORKDIR/bin/cf.events.dll" From 5d5c494a45836787e34fb2b7d0b8a8f42d38db5e Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 13 Nov 2026 15:44:31 -0600 Subject: [PATCH 8/9] mbp13 --- tests/reactor/run_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/reactor/run_test.sh b/tests/reactor/run_test.sh index 693f4be885d..6416a07e534 100644 --- a/tests/reactor/run_test.sh +++ b/tests/reactor/run_test.sh @@ -89,7 +89,7 @@ mkdir -p "$WORKDIR/bin" "$WORKDIR/tmp" #ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises$ext" ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises" ln -s "$CF_REACTOR" "$WORKDIR/bin/cf-reactor" -ln -s "$CF_AGENT" "WORKDIR/bin/cf-agent" +ln -s "$CF_AGENT" "$WORKDIR/bin/cf-agent" if [ -f "$CF_BINDIR/cf.events.dll" ]; then ln -s "$CF_BINDIR/cf.events.dll" "$WORKDIR/bin/cf.events.dll" @@ -115,7 +115,7 @@ PROMISE_NAME=$(basename "$t" .sh) export WORKDIR CFENGINE_TEST_OVERRIDE_WORKDIR LOG PROMISE_NAME echo "--- Validate test policy $policy ---" -"$CF_PROMISES" -dc $policy +"$CF_PROMISES" -dc "$policy" echo "--- Begin test $t ---" bash -ex "$t" "$policy" 2>&1 | tee "$WORKDIR/test.log" From 47535fb4dd44e033e65239f8d854f19df07c0b16 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 13 Nov 2026 16:20:20 -0600 Subject: [PATCH 9/9] maybe exe is needed for cf-reactor to call cf-promises --- tests/reactor/run_test.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/reactor/run_test.sh b/tests/reactor/run_test.sh index 6416a07e534..75163cd86b3 100644 --- a/tests/reactor/run_test.sh +++ b/tests/reactor/run_test.sh @@ -83,11 +83,10 @@ trap 'rm -rf "$WORKDIR"' EXIT mkdir -p "$WORKDIR/bin" "$WORKDIR/tmp" #ext="" -#if echo $CF_PROMISES | grep -q exe; then -# ext=".exe"; -#fi -#ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises$ext" -ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises" +if echo $CF_PROMISES | grep -q exe; then + ext=".exe"; +fi +ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises$ext" ln -s "$CF_REACTOR" "$WORKDIR/bin/cf-reactor" ln -s "$CF_AGENT" "$WORKDIR/bin/cf-agent"