From 1f719722449f99b2e09bd70add95e98bb65e5a22 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Tue, 27 Aug 2024 07:03:22 +0000
Subject: [PATCH] .github/ipc_fuzzer: use new -i 3 and -i 4 fuzz.sh options

Stop hardcoding -DCONFIG_IPC_MAJOR_x=y and use the new -3 and -4 fuzz.sh
CLI flags.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 .github/workflows/build_all.yml  | 7 ++++---
 .github/workflows/ipc_fuzzer.yml | 8 ++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index 4cce0dc83a1d..bfebeaa26954 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         # Keep these names short due to questionable Github UI choices
-        IPC: [ipc3, ipc4]
+        IPC: [3, 4]
 
     steps:
       - name: add i386 arch
@@ -65,5 +65,6 @@ jobs:
           cd workspace
           clang --verbose
           set -x
-          sof/scripts/fuzz.sh -b -- -DEXTRA_CFLAGS='-Werror' -DEXTRA_CXXFLAGS='-Werror' \
-              -DEXTRA_CONF_FILE='stub_build_all_${{ matrix.IPC }}.conf'
+          sof/scripts/fuzz.sh -b -i '${{ matrix.IPC }}' --                           \
+              -DEXTRA_CFLAGS='-Werror' -DEXTRA_CXXFLAGS='-Werror'                  \
+              -DEXTRA_CONF_FILE='stub_build_all_ipc${{ matrix.IPC }}.conf'
diff --git a/.github/workflows/ipc_fuzzer.yml b/.github/workflows/ipc_fuzzer.yml
index b7b0c6e55f95..6773af045689 100644
--- a/.github/workflows/ipc_fuzzer.yml
+++ b/.github/workflows/ipc_fuzzer.yml
@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         # Keep these names short due to questionable Github UI choices
-        IPC: [IPC3, IPC4]
+        IPC: [3, 4]
 
     steps:
       - name: add i386 arch
@@ -77,14 +77,10 @@ jobs:
           cd workspace
           clang --verbose
           set -x
-          case '${{ matrix.IPC }}' in
-            IPC3) cmake_arg='-DCONFIG_IPC_MAJOR_3=y' ;;
-            IPC4) cmake_arg='-DCONFIG_IPC_MAJOR_4=y' ;;
-          esac
           duration="${{inputs.fuzzing_duration_s}}"
           duration="${duration:-301}"  # pull_request has not 'inputs.' :-(
           # Note libFuzzer makes a difference between -jobs and -workers (capped at nproc/2)
-          sof/scripts/fuzz.sh -o fuzz-stdout.txt -t "$duration" -j"$(nproc)" -- "$cmake_arg"
+          sof/scripts/fuzz.sh -i '${{ matrix.IPC }}' -o fuzz-stdout.txt -t "$duration" -j"$(nproc)"
 
       - name: Upload stdout
         uses: actions/upload-artifact@v4