From 8b6480272ab0b6c7dc0873f9154319409837388f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sun, 4 May 2025 20:09:32 +0200
Subject: [PATCH] ci: replace variable BUILDARGS by command line arguments

---
 .github/workflows/ci.yml | 40 ++++++++++++++++++----------------------
 tools/build_test.sh      | 18 ++++--------------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e67c75043..58f14a67f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,31 +111,31 @@ jobs:
           - name: "gcc"
             cc: "gcc"
             cxx: "g++"
-            buildargs: ""
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
           - name: "gcc_ninja"
             cc: "gcc"
             cxx: "g++"
-            buildargs: "-G Ninja"
+            buildargs: "-G Ninja -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
           - name: "gcc_no_nls"
             cc: "gcc"
             cxx: "g++"
-            buildargs: "-DENABLE_NLS=OFF -DENABLE_DOC=OFF"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_NLS=OFF"
           - name: "gcc_no_zstd"
             cc: "gcc"
             cxx: "g++"
-            buildargs: "-DENABLE_ZSTD=OFF -DENABLE_DOC=OFF"
+            buildargs: "-DENABLE_TESTS=ON -DENABLE_ZSTD=OFF"
           - name: "gcc_no_cjson"
             cc: "gcc"
             cxx: "g++"
-            buildargs: "-DENABLE_CJSON=OFF -DENABLE_DOC=OFF"
+            buildargs: "-DENABLE_TESTS=ON -DENABLE_CJSON=OFF"
           - name: "gcc_no_perl_multiplicity"
             cc: "gcc"
             cxx: "g++"
-            buildargs: "-DCMAKE_C_FLAGS=\"-DNO_PERL_MULTIPLICITY=1\" -DENABLE_DOC=OFF"
+            buildargs: "-DENABLE_TESTS=ON -DCMAKE_C_FLAGS=\"-DNO_PERL_MULTIPLICITY=1\""
           - name: "gcc_coverage"
             cc: "gcc"
             cxx: "g++"
-            buildargs: "-DENABLE_CODE_COVERAGE=ON"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON -DENABLE_CODE_COVERAGE=ON"
           - name: "clang"
             cc: "clang"
             cxx: "clang++"
@@ -172,8 +172,7 @@ jobs:
       env:
         CC: ${{ matrix.config.cc }}
         CXX: ${{ matrix.config.cxx }}
-        BUILDARGS: ${{ matrix.config.buildargs }}
-      run: ./tools/build_test.sh
+      run: ./tools/build_test.sh ${{ matrix.config.buildargs }}
 
     - name: Run WeeChat
       env:
@@ -302,11 +301,11 @@ jobs:
           - name: "gcc"
             cc: "gcc"
             cxx: "g++"
-            buildargs: ""
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
           - name: "clang"
             cc: "clang"
             cxx: "clang++"
-            buildargs: ""
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
 
     name: "rockylinux-9 (${{ matrix.config.name }})"
     runs-on: ${{ matrix.os }}
@@ -327,8 +326,7 @@ jobs:
       env:
         CC: ${{ matrix.config.cc }}
         CXX: ${{ matrix.config.cxx }}
-        BUILDARGS: ${{ matrix.config.buildargs }}
-      run: ./tools/build_test.sh
+      run: ./tools/build_test.sh ${{ matrix.config.buildargs }}
 
     - name: Run WeeChat
       env:
@@ -352,11 +350,11 @@ jobs:
           # - name: "gcc"
           # cc: "gcc"
           # cxx: "g++"
-          # buildargs: ""
+          # buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
           - name: "clang"
             cc: "clang"
             cxx: "clang++"
-            buildargs: ""
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
 
     name: "freebsd-14 (${{ matrix.config.name }})"
     runs-on: ${{ matrix.os }}
@@ -370,14 +368,13 @@ jobs:
       env:
         CC: ${{ matrix.config.cc }}
         CXX: ${{ matrix.config.cxx }}
-        BUILDARGS: ${{ matrix.config.buildargs }}
         TERM: xterm-256color
       with:
-        envs: "CC CXX BUILDARGS TERM"
+        envs: "CC CXX TERM"
         usesh: true
         prepare: pkg install -y ${{ env.WEECHAT_DEPS_FREEBSD }}
         run: |
-          ./tools/build_test.sh
+          ./tools/build_test.sh ${{ matrix.config.buildargs }}
           weechat --help
           weechat-curses --help
           weechat --version
@@ -396,11 +393,11 @@ jobs:
           - name: "gcc"
             cc: "gcc"
             cxx: "g++"
-            buildargs: "-DENABLE_TESTS=OFF -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF -DENABLE_TESTS=OFF"
           - name: "clang"
             cc: "clang"
             cxx: "clang++"
-            buildargs: "-DENABLE_TESTS=OFF -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF -DENABLE_TESTS=OFF"
 
     name: "${{ matrix.os }} (${{ matrix.config.name }})"
     runs-on: ${{ matrix.os }}
@@ -435,9 +432,8 @@ jobs:
       env:
         CC: ${{ matrix.config.cc }}
         CXX: ${{ matrix.config.cxx }}
-        BUILDARGS: ${{ matrix.config.buildargs }}
         RUN_TESTS: "0"
-      run: ./tools/build_test.sh
+      run: ./tools/build_test.sh ${{ matrix.config.buildargs }}
 
     - name: Run WeeChat
       env:
diff --git a/tools/build_test.sh b/tools/build_test.sh
index 7b486c0c8..0b50584ec 100755
--- a/tools/build_test.sh
+++ b/tools/build_test.sh
@@ -22,11 +22,10 @@
 
 #
 # Build WeeChat according to environment variables:
-#   - BUILDARGS: arguments for cmake command
 #   - RUN_TESTS: set to 0 to disable run of tests
 #
 # Syntax to run the script with environment variables:
-#   BUILDARGS="arguments" ./build_test.sh
+#   RUN_TESTS=0 ./build_test.sh
 #
 # Syntax to run the script with arguments on command line:
 #   ./build_test.sh [arguments]
@@ -36,25 +35,16 @@
 
 set -o errexit
 
-build_dir="build-tmp-$$"
-
-if [ $# -ge 1 ]; then
-    BUILDARGS="$*"
-fi
-
-run ()
-{
-    "$@"
-}
-
 # display commands
 set -x
 
+build_dir="build-tmp-$$"
+
 # create build directory
 mkdir "${build_dir}"
 cd "${build_dir}"
 
-run cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON "${BUILDARGS}"
+cmake .. "$@"
 if [ -f "build.ninja" ]; then
     ninja -v
     sudo ninja install