bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-01-08 22:12:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test.sh option --internet, function checkcond

Browse source
This commit is contained in:
Gerhard Rieger 2023-11-06 21:22:18 +01:00
parent 44c9eb1d9d
commit f61a95585b
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -238,7 +238,7 @@ Porting:
Testing: Testing:
Removed obselete parts from test.sh Removed obselete parts from test.sh
Introduced function checkcond from test.sh test.sh: Introduced function checkcond
Renamed test.sh option -foreign to -internet Renamed test.sh option -foreign to -internet

18
test.sh
View file

@ -455,7 +455,7 @@ SunOS)
#BROADCASTIF=hme0 #BROADCASTIF=hme0
#BROADCASTIF=eri0 #BROADCASTIF=eri0
#SECONDADDR=$($IFCONFIG $BROADCASTIF |grep 'inet ' |awk '{print($2);}') #SECONDADDR=$($IFCONFIG $BROADCASTIF |grep 'inet ' |awk '{print($2);}')
SECONDADDR=$(expr "$($IFCONFIG -a |grep 'inet ' |fgrep -v ' 127.0.0.1 '| head -n 1)" : '.*inet \([0-9.]*\) .*') SECONDADDR=$(expr "$($IFCONFIG -a |grep 'inet ' |fgrep -v ' 127.0.0.1 '| head -n 1)" : '.*inet \([0-9.]*\) .*')
#BCIFADDR="$SECONDADDR" #BCIFADDR="$SECONDADDR"
#BCADDR=$($IFCONFIG $BROADCASTIF |grep 'broadcast ' |sed 's/.*broadcast/broadcast/' |awk '{print($2);}') #BCADDR=$($IFCONFIG $BROADCASTIF |grep 'broadcast ' |sed 's/.*broadcast/broadcast/' |awk '{print($2);}')
;; ;;
@ -467,7 +467,7 @@ DragonFly)
BCADDR=$($IFCONFIG "$BROADCASTIF" |grep 'broadcast ' |sed 's/.*broadcast/broadcast/' |awk '{print($2);}') ;; BCADDR=$($IFCONFIG "$BROADCASTIF" |grep 'broadcast ' |sed 's/.*broadcast/broadcast/' |awk '{print($2);}') ;;
#AIX|FreeBSD|Solaris) #AIX|FreeBSD|Solaris)
*) *)
SECONDADDR=$(expr "$($IFCONFIG -a |grep 'inet ' |fgrep -v ' 127.0.0.1 ' |head -n 1)" : '.*inet \([0-9.]*\) .*') SECONDADDR=$(expr "$($IFCONFIG -a |grep 'inet ' |fgrep -v ' 127.0.0.1 ' |head -n 1)" : '.*inet \([0-9.]*\) .*')
;; ;;
esac esac
# for generic sockets we need this address in hex form # for generic sockets we need this address in hex form
@ -478,12 +478,12 @@ fi
# for some tests we need a second local IPv6 address # for some tests we need a second local IPv6 address
case "$UNAME" in case "$UNAME" in
Linux) if [ "$IP" ]; then Linux) if [ "$IP" ]; then
SECONDIP6ADDR=$(expr "$($IP address |grep 'inet6 ' |fgrep -v ' ::1/128 '| head -n 1)" : '.*inet6 \([0-9a-f:][0-9a-f:]*\)/.*') SECONDIP6ADDR=$(expr "$($IP address |grep 'inet6 ' |fgrep -v ' ::1/128 '| head -n 1)" : '.*inet6 \([0-9a-f:][0-9a-f:]*\)/.*')
else else
SECONDIP6ADDR=$(expr "$($IFCONFIG -a |grep 'inet6 ' |fgrep -v ' ::1/128 '| head -n 1)" : '.*inet \([0-9.]*\) .*') SECONDIP6ADDR=$(expr "$($IFCONFIG -a |grep 'inet6 ' |fgrep -v ' ::1/128 '| head -n 1)" : '.*inet \([0-9.]*\) .*')
fi ;; fi ;;
*) *)
SECONDIP6ADDR=$(expr "$($IFCONFIG -a |grep 'inet6 ' |fgrep -v ' ::1/128 '| head -n 1)" : '.*inet \([0-9.]*\) .*') SECONDIP6ADDR=$(expr "$($IFCONFIG -a |grep 'inet6 ' |fgrep -v ' ::1/128 '| head -n 1)" : '.*inet \([0-9.]*\) .*')
;; ;;
esac esac
if [ -z "$SECONDIP6ADDR" ]; then if [ -z "$SECONDIP6ADDR" ]; then
@ -491,7 +491,7 @@ if [ -z "$SECONDIP6ADDR" ]; then
# *%root2%*) $IFCONFIG eth0 ::2/128 # *%root2%*) $IFCONFIG eth0 ::2/128
# esac # esac
SECONDIP6ADDR="$LOCALHOST6" SECONDIP6ADDR="$LOCALHOST6"
else else
SECONDIP6ADDR="[$SECONDIP6ADDR]" SECONDIP6ADDR="[$SECONDIP6ADDR]"
fi fi
@ -2143,7 +2143,7 @@ elif ! cond=$(checkconds "" "" "" \
$PRINTF "test $F_n $TEST... ${YELLOW}$cond${NORMAL}\n" $N $PRINTF "test $F_n $TEST... ${YELLOW}$cond${NORMAL}\n" $N
numCANT=$((numCANT+1)) numCANT=$((numCANT+1))
listCANT="$listCANT $N" listCANT="$listCANT $N"
else else
tf="$td/test$N.stdout" tf="$td/test$N.stdout"
te="$td/test$N.stderr" te="$td/test$N.stderr"
tdiff="$td/test$N.diff" tdiff="$td/test$N.diff"
@ -18167,7 +18167,7 @@ else
rc1=$? rc1=$?
kill $pid0 2>/dev/null; wait kill $pid0 2>/dev/null; wait
if [ "$rc1" -ne 0 ]; then if [ "$rc1" -ne 0 ]; then
$PRINTF "$FAILED\n" $PRINTF "$FAILED (rc1=$rc1)\n"
echo "$CMD0 &" echo "$CMD0 &"
cat "${te}0" >&2 cat "${te}0" >&2
echo "$CMD1" echo "$CMD1"
@ -18176,7 +18176,7 @@ else
listFAIL="$listFAIL $N" listFAIL="$listFAIL $N"
namesFAIL="$namesFAIL $NAME" namesFAIL="$namesFAIL $NAME"
elif ! echo "$da" |diff "${tf}1" - >$tdiff; then elif ! echo "$da" |diff "${tf}1" - >$tdiff; then
$PRINTF "$FAILED\n" $PRINTF "$FAILED (diff)\n"
echo "$CMD0 &" echo "$CMD0 &"
cat "${te}0" >&2 cat "${te}0" >&2
echo "$CMD1" echo "$CMD1"