Merge remote-tracking branch 'origin/topic/awelzel/faster-btest-run-bg-and-wait'

* origin/topic/awelzel/faster-btest-run-bg-and-wait:
  Make btest-bg-run delay configurable
  Make btest-bg-wait more responsive

Author: awelzel

CHANGES

@@ -1,3 +1,17 @@
+1.2-7 | 2025-03-20 10:09:16 +0100
+
+  * Make btest-bg-run delay configurable (Arne Welzel, Corelight)
+
+    Allow users to remove the unconditional sleep 1 by introducing
+    a new environment variable BTEST_BG_RUN_SLEEP that specifies the
+    amount of seconds to sleep. If tests are written robustly, setting
+    this to 0 can speed up execution of btest-bg-run heavy test suites.
+
+  * Make btest-bg-wait more responsive (Arne Welzel, Corelight)
+
+    Sleep 10 msec instead of 1 second to check for process termination to
+    make detecting process termination a bit more timely.
+
 1.2-4 | 2025-01-29 09:03:57 -0700
 
   * Require CMake 3.15, inline with other Zeek projects (Tim Wojtulewicz, Corelight)

README

@@ -2,7 +2,7 @@
 ..
 .. Version number is filled in automatically.
 
-.. |version| replace:: 1.2-4
+.. |version| replace:: 1.2-7
 
 ==================================================
 BTest - A Generic Driver for Powerful System Tests

VERSION

@@ -1 +1 @@
-1.2-4
+1.2-7

btest

@@ -56,7 +56,7 @@ else:
     import multiprocessing.managers as mp_managers
     import multiprocessing.sharedctypes as mp_sharedctypes
 
-VERSION = "1.2-4"  # Automatically filled in.
+VERSION = "1.2-7"  # Automatically filled in.
 
 Name = "btest"
 Config = None

btest-bg-run

@@ -6,6 +6,10 @@
 # and spawns <cmdline> in there in the background. It also records
 # a set of meta information that btest-bg-wait will read.
 
+# Sleep this many seconds after creating the process and before
+# returning from btest-bg-run.
+BTEST_BG_RUN_SLEEP=${BTEST_BG_RUN_SLEEP:-1}
+
 if [ "$#" -le 1 ]; then
     echo "usage: $(basename "$0") <tag> <cmdline>"
     exit 1
@@ -33,4 +37,4 @@ echo "$@" >.cmdline
 
 $setsid "$helper" "$@" >.stdout 2>.stderr &
 
-sleep 1
+sleep "$BTEST_BG_RUN_SLEEP"

btest-bg-wait

@@ -25,7 +25,7 @@ if [ $# != 1 ]; then
     exit 1
 fi
 
-timeout=$1
+timeout=$(($1 * 100))
 
 procs=$(cat .bgprocs)
 
@@ -122,7 +122,7 @@ while true; do
         exit 1
     fi
 
-    sleep 1
+    sleep 0.01
 done
 
 trap - EXIT

setup.py

@@ -5,6 +5,6 @@
 py_modules = ["btest-sphinx"]
 
 setup(
-    version="1.2.dev4",  # Filled in automatically.
+    version="1.2.dev7",  # Filled in automatically.
     py_modules=py_modules,
 )