...

Author: Mathew

.github/workflows/build-test.yml

@@ -253,52 +253,14 @@ jobs:
       run: |
         sudo mkdir -p /var/lib/scache/
         sudo chmod 0777 /var/lib/scache/
-        chmod +x ./src/server/scache
+        chmod +x ./src/server/scache ./run-php-tests.sh
         PWD=$(pwd)
         VALGRIND_SUPPRESSIONS=""
         if [[ "${{ matrix.target.cow_suppressions }}" == "true" ]]; then
-          VALGRIND_SUPPRESSIONS="--suppressions=$PWD/valgrind-cow-child.supp"
+          VALGRIND_SUPPRESSIONS=" --suppressions=$PWD/valgrind-cow-child.supp"
         fi
-
-
-        pids=""
-        function wait_all {
-            for p in $pids; do
-                IFS=" " read -r -a arrIN <<< "${p//:/ }"
-                if wait "${arrIN[0]}"; then
-                    echo "Task \"${arrIN[1]}\" (${arrIN[0]}) succeeded"
-                else
-                    echo "Task \"${arrIN[1]}\" (${arrIN[0]}) fail"
-                    exit 1
-                fi
-            done
-        }
-
-        function run_tests {
-          set -x
-          set +e
-          for i in {1..30}; do
-            curl 127.0.0.1:8081 --max-time 1 --connect-timeout 1
-            if [[ $? == 0 ]]; then
-              echo "ready to start php test"
-              break
-            fi
-            sleep 1
-          done
-
-          set -e
-          set -x 
-          for x in tests/php/test_*.php; do
-            echo "Doing test $x"
-            php "$x"
-          done
-        }
-
-        run_tests &
-        pids="$!:php"
-
-        timeout --kill-after=5 --preserve-status 5m valgrind --leak-check=full --show-leak-kinds=all $VALGRIND_SUPPRESSIONS src/server/scache -b 127.0.0.1:8081 -B 127.0.0.1:8082
-
-        wait_all
+        export SCACHE_VALGRIND=1
+        export SCACHE_VALGRIND_ARGS="--leak-check=full --show-leak-kinds=all$VALGRIND_SUPPRESSIONS"
+        ./run-php-tests.sh
       shell: bash
 

run-php-tests.sh

@@ -15,7 +15,9 @@ PORT="${2:-$RANDOM_PORT}"
 HOST="127.0.0.1"
 PIDFILE="/tmp/scache-consistency-test.pid"
 DBDIR="/tmp/scache-consistency-test-db"
-SCACHE_BIN="$SCRIPT_DIR/src/server/scache"
+SCACHE_BIN_REAL="$SCRIPT_DIR/src/server/scache"
+SCACHE_BIN="$SCACHE_BIN_REAL"
+VALGRIND_WRAPPER="/tmp/scache-consistency-valgrind.sh"
 
 # Colors
 RED='\033[0;31m'
@@ -35,28 +37,51 @@ echo "Tests: $TEST_SELECTOR"
 echo ""
 
 # Build scache if needed
-if [ ! -x "$SCACHE_BIN" ]; then
+if [ ! -x "$SCACHE_BIN_REAL" ]; then
     echo -e "${YELLOW}Building simple-cache...${NC}"
     cd "$SCRIPT_DIR"
     make clean && make
-    if [ ! -x "$SCACHE_BIN" ]; then
+    if [ ! -x "$SCACHE_BIN_REAL" ]; then
         echo -e "${RED}Failed to build simple-cache${NC}"
         exit 1
     fi
 fi
 
+if [ "${SCACHE_VALGRIND:-0}" = "1" ]; then
+    cat > "$VALGRIND_WRAPPER" <<EOF
+#!/bin/bash
+exec valgrind ${SCACHE_VALGRIND_ARGS:---leak-check=full --show-leak-kinds=all} "$SCACHE_BIN_REAL" "\$@"
+EOF
+    chmod +x "$VALGRIND_WRAPPER"
+    SCACHE_BIN="$VALGRIND_WRAPPER"
+fi
+
+export SCACHE_PIDFILE="$PIDFILE"
+export SCACHE_DBDIR="$DBDIR"
+export SCACHE_BIN
+
 # Clean up any previous run
 cleanup() {
     if [ -f "$PIDFILE" ]; then
         PID=$(cat "$PIDFILE" 2>/dev/null)
         if [ -n "$PID" ] && [ "$PID" != "0" ] && [ "$PID" != "" ] && kill -0 "$PID" 2>/dev/null; then
-            kill -9 "$PID" 2>/dev/null || true
+            kill -TERM "$PID" 2>/dev/null || true
+            for _ in $(seq 1 50); do
+                if ! kill -0 "$PID" 2>/dev/null; then
+                    break
+                fi
+                sleep 0.1
+            done
+            if kill -0 "$PID" 2>/dev/null; then
+                kill -KILL "$PID" 2>/dev/null || true
+            fi
         fi
         rm -f "$PIDFILE"
     fi
     rm -rf "$DBDIR"
 }
 cleanup
+trap 'rm -f "$VALGRIND_WRAPPER"' EXIT
 
 # Start server
 start_server() {