CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / build_matrix.sh

diff --git a/build_matrix.sh b/build_matrix.sh
index 3089bad9227630a952252de643a9709e04993885..93daca63b5cb3d27117e149e42745e68cb6836ca 100755 (executable)
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -7,7 +7,7 @@
 # MATRIX_BUILD_LIBPCAP, MATRIX_REMOTE, MATRIX_CC, MATRIX_CMAKE, MATRIX_CRYPTO
 # and MATRIX_SMB.
 
-: "${MATRIX_BUILD_LIBPCAP:=no yes}"
+: "${MATRIX_BUILD_LIBPCAP:=yes no}"
 : "${MATRIX_REMOTE:=no}"
 : "${MATRIX_CC:=gcc clang}"
 : "${MATRIX_CMAKE:=no yes}"
@@ -49,8 +49,8 @@ build_tcpdump() {
             export CRYPTO
             for SMB in $MATRIX_SMB; do
                 export SMB
-                COUNT=`increment $COUNT`
-                echo_magenta "===== SETUP $COUNT: BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CC=$CC CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2
+                COUNT=`increment "$COUNT"`
+                echo_magenta "===== SETUP $COUNT: CC=$CC BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2
                 # Run one build with setup environment variables:
                 # BUILD_LIBPCAP, REMOTE, CC, CMAKE, CRYPTO and SMB
                 run_after_echo ./build.sh
@@ -62,14 +62,13 @@ build_tcpdump() {
                 fi
                 run_after_echo rm -rf "$PREFIX"/bin/tcpdump*
                 run_after_echo git status -suall
-                # Cancel changes in configure
-                run_after_echo git checkout configure
             done
         done
     done
 }
 
-touch .devel configure
+run_after_echo git show --oneline -s | cat
+touch .devel
 for CC in $MATRIX_CC; do
     export CC
     discard_cc_cache