From bbb00f061ffb1a376bcffd6f9d616e9f8e54f576 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Apr 10 2014 23:27:51 +0000 Subject: disable more unreliable tests related to SCTP --- diff --git a/socat-1.7.2.4-test.patch b/socat-1.7.2.4-test.patch index fa09ac3..ba03f97 100644 --- a/socat-1.7.2.4-test.patch +++ b/socat-1.7.2.4-test.patch @@ -1,6 +1,6 @@ diff -Naur socat-1.7.2.4-orig/test.sh socat-1.7.2.4/test.sh --- socat-1.7.2.4-orig/test.sh 2014-03-09 10:51:39.000000000 -0400 -+++ socat-1.7.2.4/test.sh 2014-04-10 10:43:46.203041414 -0400 ++++ socat-1.7.2.4/test.sh 2014-04-10 19:26:46.744943241 -0400 @@ -3713,11 +3713,13 @@ if [ "$MYPID" = "$MYPPID" -o "$MYPID" = "$MYPGID" -o "$MYPID" = "$MYSID" -o \ "$MYPPID" = "$MYPGID" -o "$MYPPID" = "$MYSID" -o "$MYPGID" = "$MYSID" ]; @@ -64,7 +64,17 @@ diff -Naur socat-1.7.2.4-orig/test.sh socat-1.7.2.4/test.sh elif ! testaddrs socks4a >/dev/null; then $PRINTF "test $F_n $TEST... ${YELLOW}SOCKS4A not available${NORMAL}\n" $N numCANT=$((numCANT+1)) -@@ -9669,7 +9685,7 @@ +@@ -9660,6 +9676,9 @@ + # outside code then checks if the environment contains the variables correctly + # describing the peer and local sockets. + if ! eval $NUMCOND; then :; ++elif test -n "not-empty"; then ++ $PRINTF "test $F_n $TEST... ${YELLOW}$(echo "$feat" |tr a-z A-Z) too unreliable${NORMAL}\n" $N ++ numCANT=$((numCANT+1)) + elif ! feat=$(testaddrs $FEAT); then + $PRINTF "test $F_n $TEST... ${YELLOW}$(echo "$feat" |tr a-z A-Z) not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) +@@ -9669,7 +9688,7 @@ numCANT=$((numCANT+1)) elif [ "$KEYW" = "SCTP4" ] && ! runssctp4 "$((PORT))"; then $PRINTF "test $F_n $TEST... ${YELLOW}$KEYW not available${NORMAL}\n" $N