From 2301ab23488b9db95eba40750f355a4439468b89 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Mon, 12 Feb 2024 08:58:58 -0300
Subject: build: standardize ./configure arguments

For consistency and to make it clearer where jobs differ (for example,
to see where `--enable-analyzer` is used).

Changes:

* Always use --prefix=/usr and --enable-fatal-warnings (except in the
  Alpine job due to current warnings; see #6224)
* Use the same argument order

Note: mkdeb.sh and platform/rpm/mkrpm.sh already pass `--prefix=/usr` to
./configure.
---
 test/compile/compile.sh | 94 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 75 insertions(+), 19 deletions(-)

(limited to 'test')

diff --git a/test/compile/compile.sh b/test/compile/compile.sh
index 30bfe9e66..f3e5c4f33 100755
--- a/test/compile/compile.sh
+++ b/test/compile/compile.sh
@@ -81,7 +81,9 @@ tar -xJvf ../../"$DIST.tar.xz"
 mv "$DIST" firejail
 
 cd firejail || exit 1
-./configure --prefix=/usr --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test1
@@ -98,7 +100,10 @@ rm output-configure output-make
 print_title "${arr[2]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-dbusproxy --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-dbusproxy \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test2
@@ -115,7 +120,10 @@ rm output-configure output-make
 print_title "${arr[3]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-chroot --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-chroot \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test3
@@ -132,7 +140,10 @@ rm output-configure output-make
 print_title "${arr[4]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-firetunnel --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-firetunnel \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test4
@@ -149,7 +160,10 @@ rm output-configure output-make
 print_title "${arr[5]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-userns --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-userns \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test5
@@ -167,7 +181,10 @@ rm output-configure output-make
 print_title "${arr[6]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-network --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-network \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test6
@@ -184,7 +201,10 @@ rm output-configure output-make
 print_title "${arr[7]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-x11 --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-x11 \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test7
@@ -201,7 +221,10 @@ rm output-configure output-make
 print_title "${arr[8]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --enable-selinux --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --enable-selinux \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test8
@@ -218,7 +241,10 @@ rm output-configure output-make
 print_title "${arr[9]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-file-transfer --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-file-transfer \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test9
@@ -235,7 +261,10 @@ rm output-configure output-make
 print_title "${arr[10]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-whitelist --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-whitelist \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test10
@@ -252,7 +281,10 @@ rm output-configure output-make
 print_title "${arr[11]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-globalcfg --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-globalcfg \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test11
@@ -269,7 +301,10 @@ rm output-configure output-make
 print_title "${arr[12]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --enable-apparmor \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test12
@@ -286,7 +321,10 @@ rm output-configure output-make
 print_title "${arr[13]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --enable-busybox-workaround --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --enable-busybox-workaround \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test13
@@ -303,7 +341,10 @@ rm output-configure output-make
 print_title "${arr[14]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-overlayfs --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-overlayfs \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test14
@@ -320,7 +361,10 @@ rm output-configure output-make
 print_title "${arr[15]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-private-home \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test15
@@ -337,7 +381,10 @@ rm output-configure output-make
 print_title "${arr[16]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-man --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-man \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test16
@@ -354,7 +401,10 @@ rm output-configure output-make
 print_title "${arr[17]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-usertmpfs --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-usertmpfs \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test17
@@ -371,7 +421,10 @@ rm output-configure output-make
 print_title "${arr[18]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --disable-private-home \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test18
@@ -388,7 +441,10 @@ rm output-configure output-make
 print_title "${arr[19]}"
 cd firejail || exit 1
 make distclean
-./configure --prefix=/usr --enable-ids --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-fatal-warnings \
+  --enable-ids \
+  2>&1 | tee ../output-configure
+
 make -j "$(nproc)" 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test19
-- 
cgit v1.2.3-54-g00ecf