Merge pull request #325 from padelsbach/wp-tcpdump-ci-fail

Fix tcpdump CI workflow

Author: ColtonWilley

.github/scripts/check-workflow-result.sh

@@ -274,13 +274,14 @@ if [ "$WOLFPROV_FORCE_FAIL" = "WOLFPROV_FORCE_FAIL=1" ]; then
     # ----- TCPDUMP -----
     elif [ "$TEST_SUITE" = "tcpdump" ]; then
         if [ -f "tcpdump-test.log" ]; then
-            # Check for expected 7 failed tests (ESP/crypto segfaults)
-            if grep -q "2 tests failed" tcpdump-test.log; then
-                echo "PASS: tcpdump tests failed as expected with force fail enabled (2 tests failed)"
-                exit 0
-            else
-                echo "FAIL: tcpdump tests did not fail as expected (should have 2 failed tests)"
+            # Expect 7 failed tests (ESP/crypto segfaults) in non-FIPS
+            # and 2 failed tests in FIPS mode
+            if grep -q "Tests passed successfully" tcpdump-test.log; then
+                echo "FAIL: tcpdump tests did not fail as expected"
                 exit 1
+            else
+                echo "PASS: tcpdump tests failed as expected with force fail enabled"
+                exit 0
             fi
         else
             echo "Error: tcpdump-test.log not found"

.github/workflows/tcpdump.yml

@@ -82,20 +82,6 @@ jobs:
           apt-get install -y build-essential flex bison autoconf libtool\
             libpcap-dev
 
-      - name: Checkout libpcap
-        uses: actions/checkout@v4
-        with:
-          repository: the-tcpdump-group/libpcap
-          path: libpcap_repo
-          # Compiling tcpdump from source explicitly requires a built libpcap installation
-      - name: Build and install libpcap
-        working-directory: libpcap_repo
-        run: |
-          ./autogen.sh
-          ./configure --prefix=$GITHUB_WORKSPACE/libpcap-install
-          make -j$(nproc)
-          make install
-
       - name: Checkout tcpdump
         uses: actions/checkout@v4
         with:
@@ -111,10 +97,8 @@ jobs:
           fetch-depth: 1
       - run: |
           cd tcpdump_repo
-          if [ ${{ matrix.fips_ref == 'FIPS' }} ]; then
+          if [ "${{ matrix.fips_ref }}" = "FIPS" ]; then
             patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/tcpdump/tcpdump-FIPS-${{ matrix.tcpdump_ref }}-wolfprov.patch
-          else
-            patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/tcpdump/tcpdump-${{ matrix.tcpdump_ref }}-wolfprov.patch
           fi
 
       - name: Build and install tcpdump