bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-23 07:52:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adapted test.sh for musl libc

Browse source
This commit is contained in:
Gerhard Rieger 2022-10-29 12:01:47 +02:00
parent e6c03a4c94
commit 26f1f8a2eb
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -8,6 +8,12 @@ Testing:
Fixed logging of test 220 TUNINTERFACE Fixed logging of test 220 TUNINTERFACE
Musl libc refuses to execve() shell scripts, 2 tests needed to be
adapted.
Musl libc has FOPEN_MAX=1000 which made bash dumping core on test
EXCEED_FOPEN_MAX.
####################### V 1.7.4.3: ####################### V 1.7.4.3:
Corrections: Corrections:

22
test.sh
View file

@ -8996,7 +8996,8 @@ da="test$N $(date) $RANDOM XXXX"
sh="$td/test$N-sed.sh" sh="$td/test$N-sed.sh"
echo 'sed s/XXXX/YYYY/' >"$sh" echo 'sed s/XXXX/YYYY/' >"$sh"
chmod a+x "$sh" chmod a+x "$sh"
CMD1="$TRACE $SOCAT $opts IP4-RECVFROM:$ts1p,reuseaddr,broadcast exec:$sh" # EXEC need not work with script (musl libc), so use SYSTEM
CMD1="$TRACE $SOCAT $opts IP4-RECVFROM:$ts1p,reuseaddr,broadcast SYSTEM:$sh"
#CMD2="$TRACE $SOCAT $opts - IP4-BROADCAST:$ts1" #CMD2="$TRACE $SOCAT $opts - IP4-BROADCAST:$ts1"
CMD2="$TRACE $SOCAT $opts - IP4-DATAGRAM:$ts1,broadcast" CMD2="$TRACE $SOCAT $opts - IP4-DATAGRAM:$ts1,broadcast"
printf "test $F_n $TEST... " $N printf "test $F_n $TEST... " $N
@ -9871,6 +9872,7 @@ N=$((N+1))
# Cygwin: 20 unlimit 256 64 # Cygwin: 20 unlimit 256 64
# AIX: 32767 65534 65534 # AIX: 32767 65534 65534
# SunOS 8: 20 1024 # SunOS 8: 20 1024
# musl libc: 1024
NAME=EXCEED_FOPEN_MAX NAME=EXCEED_FOPEN_MAX
case "$TESTS" in case "$TESTS" in
*%$N%*|*%functions%*|*%maxfds%*|*%$NAME%*) *%$N%*|*%functions%*|*%maxfds%*|*%$NAME%*)
@ -9891,11 +9893,16 @@ if [ -z "$FOPEN_MAX" ]; then
numCANT=$((numCANT+1)) numCANT=$((numCANT+1))
listCANT="$listCANT $N" listCANT="$listCANT $N"
else else
OPEN_FILES=$FOPEN_MAX # more than the highest FOPEN_MAX if [ $FOPEN_MAX -lt 270 ]; then
#i=3; while [ "$i" -lt "$OPEN_FILES" ]; do OPEN_FILES=$FOPEN_MAX # more than the highest FOPEN_MAX
# REDIR="$REDIR $i>&2" else
# i=$((i+1)) OPEN_FILES=269 # bash tends to SIGSEGV on higher value
#done # btw, the test is obsolete anyway
fi
i=3; while [ "$i" -lt "$OPEN_FILES" ]; do
REDIR="$REDIR $i>&2"
i=$((i+1))
done
#echo "$REDIR" #echo "$REDIR"
#testecho "$N" "$TEST" "" "pipe" "$opts -T 3" "" 1 #testecho "$N" "$TEST" "" "pipe" "$opts -T 3" "" 1
#set -vx #set -vx
@ -13732,7 +13739,8 @@ CMD0="$TRACE $SOCAT $opts -T 1 STDIO,echo=0 EXEC:cat"
echo "$CMD0" >$td/test$N.sh echo "$CMD0" >$td/test$N.sh
chmod a+x $td/test$N.sh chmod a+x $td/test$N.sh
printf "test $F_n $TEST... " $N printf "test $F_n $TEST... " $N
$SOCAT /dev/null EXEC:$td/test$N.sh,pty 2>"${te}0" # EXEC need not work with script (musl libc), so use SYSTEM
$SOCAT /dev/null SYSTEM:$td/test$N.sh,pty 2>"${te}0"
rc0=$? rc0=$?
if [ $rc0 -eq 0 ]; then if [ $rc0 -eq 0 ]; then
$PRINTF "$OK\n" $PRINTF "$OK\n"