RADIUS: Rename a test with an invalid length

[tcpdump] / build_matrix.sh

diff --git a/build_matrix.sh b/build_matrix.sh
index c5f699a0c177864b159cff4351177334fd3747a8..19980c2e1f3267e49b90776e0bf1150ee8071c8e 100755 (executable)
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -13,24 +13,34 @@
 : "${MATRIX_CMAKE:=no yes}"
 : "${MATRIX_CRYPTO:=no yes}"
 : "${MATRIX_SMB:=no yes}"
 : "${MATRIX_CMAKE:=no yes}"
 : "${MATRIX_CRYPTO:=no yes}"
 : "${MATRIX_SMB:=no yes}"

+# Set this variable to "yes" before calling this script to disregard all cmake
+# warnings in a particular environment (CI or a local working copy).  Set it
+# to "yes" in this script or in build.sh when a matrix subset is known to be
+# not cmake warning-free because of the version or whatever other factor
+# that the scripts can detect both in and out of CI.
+: "${TCPDUMP_CMAKE_TAINTED:=no}"

 # Set this variable to "yes" before calling this script to disregard all
 # warnings in a particular environment (CI or a local working copy).  Set it
 # to "yes" in this script or in build.sh when a matrix subset is known to be
 # not warning-free because of the OS, the compiler or whatever other factor
 # that the scripts can detect both in and out of CI.
 : "${TCPDUMP_TAINTED:=no}"
 # Set this variable to "yes" before calling this script to disregard all
 # warnings in a particular environment (CI or a local working copy).  Set it
 # to "yes" in this script or in build.sh when a matrix subset is known to be
 # not warning-free because of the OS, the compiler or whatever other factor
 # that the scripts can detect both in and out of CI.
 : "${TCPDUMP_TAINTED:=no}"

+# Some OSes have native make without parallel jobs support and sometimes have
+# GNU Make available as "gmake".
+: "${MAKE_BIN:=make}"

 
 . ./build_common.sh
 print_sysinfo
 # Install directory prefix
 if [ -z "$PREFIX" ]; then
 
 . ./build_common.sh
 print_sysinfo
 # Install directory prefix
 if [ -z "$PREFIX" ]; then

-    # shellcheck disable=SC2006

     PREFIX=`mktempdir tcpdump_build_matrix`
     echo "PREFIX set to '$PREFIX'"
     export PREFIX
 fi
 COUNT=0
 export TCPDUMP_TAINTED
     PREFIX=`mktempdir tcpdump_build_matrix`
     echo "PREFIX set to '$PREFIX'"
     export PREFIX
 fi
 COUNT=0
 export TCPDUMP_TAINTED

+export TCPDUMP_CMAKE_TAINTED
+export MAKE_BIN

 
 build_tcpdump() {
     for CMAKE in $MATRIX_CMAKE; do
 
 build_tcpdump() {
     for CMAKE in $MATRIX_CMAKE; do


@@ -39,7 +49,6 @@ build_tcpdump() {
             export CRYPTO
             for SMB in $MATRIX_SMB; do
                 export SMB
             export CRYPTO
             for SMB in $MATRIX_SMB; do
                 export SMB

-                # shellcheck disable=SC2006

                 COUNT=`increment $COUNT`
                 echo_magenta "===== SETUP $COUNT: BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CC=$CC CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2
                 # Run one build with setup environment variables:
                 COUNT=`increment $COUNT`
                 echo_magenta "===== SETUP $COUNT: BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CC=$CC CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2
                 # Run one build with setup environment variables:


@@ -49,18 +58,16 @@ build_tcpdump() {
                 if [ "$CMAKE" = yes ]; then
                     run_after_echo rm -rf build
                 else
                 if [ "$CMAKE" = yes ]; then
                     run_after_echo rm -rf build
                 else

-                    run_after_echo make distclean
+                    run_after_echo "$MAKE_BIN" distclean

                 fi
                 run_after_echo rm -rf "$PREFIX"/bin/tcpdump*
                 run_after_echo git status -suall
                 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
 }
 
             done
         done
     done
 }
 

-touch .devel configure
+touch .devel

 for CC in $MATRIX_CC; do
     export CC
     discard_cc_cache
 for CC in $MATRIX_CC; do
     export CC
     discard_cc_cache


@@ -86,7 +93,9 @@ for CC in $MATRIX_CC; do
         else
             echo_magenta 'Use system libpcap' >&2
             purge_directory "$PREFIX"
         else
             echo_magenta 'Use system libpcap' >&2
             purge_directory "$PREFIX"

-            (cd ../libpcap; make distclean || echo '(Ignoring the make error.)')
+            if [ -d ../libpcap ]; then
+                (cd ../libpcap; "$MAKE_BIN" distclean || echo '(Ignoring the make error.)')
+            fi

             build_tcpdump
         fi
     done
             build_tcpdump
         fi
     done