socat/socat-test-without-tty.patch
Marcus Meissner 38c2536074 Accepting request 1171181 from home:crameleon:branches:network:utilities
- Update to 1.8.0.0:
    * Support for network namespaces (option netns)
    * TCP client now automatically tries all addresses (IPv4 and IPv6) provided by nameserver until success
    * Implementation of POSIX message queue (mq) control and access on Linux (addresses POSIXMQ-READ and following)
    * New wrapper script socat-chain.sh allows to stack two addresses, e.g.HTTP proxy connect over SSL
    * New script socat-mux.sh allows n-to-1 / 1-to-n communications
    * New script socat-broker.sh allows group communications
    * Experimental socks5 client feature
    * Address ACCEPT-FD for systemd "inetd" mode
    * UDP-Lite and DCCP address types
    * Addresses SOCKETPAIR and SHELL
    * New option bind-tmpname allows forked off children to bind UNIX domain client sockets to random unique pathes
    * New option retrieve-vlan (with INTERFACE addresses) now makes kernel keep VLAN tags in incoming packets
    * Simple statistics output with Socat option --statistics and with SIGUSR1
    * A couple of new options, many fixes and corrections, see file CHANGES
- Drop socat-common-fixes.patch (no longer necessary)
- Refactor socat-ignore-tests-failure-boo1078346.patch (test suite no longer exits at this stage)
- Add socat-test-dhparam fixture (reduce build load and time)
- Note: This version introduces "socat1", linking to "socat"
- Note: This version introduces additional shell scripts, those are shipped in a new "socat-extra" subpackage

OBS-URL: https://build.opensuse.org/request/show/1171181
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=63
2024-05-02 09:47:59 +00:00

21 lines
514 B
Diff

--- a/test.sh 2023-11-13 20:31:08.000000000 +0100
+++ b/test.sh 2024-05-01 21:25:27.709337509 +0200
@@ -16054,9 +16054,15 @@
pid0=$!
relsleep 2
TTY=$(tty |sed 's|/dev/||')
-pkill -USR1 -t $TTY socat || { echo "pkill -t $TTY -USR1 socat"; }
+if [ "$TTY" = 'not a tty' ]
+then
+ TTY=''
+else
+ TTY="-t $TTY"
+fi
+pkill -USR1 $TTY socat || { echo "pkill $TTY -USR1 socat"; }
relsleep 1
-pkill -t $TTY socat
+pkill $TTY socat
wait
if [ "$(grep STATISTICS "${te}0" |wc -l)" -eq 2 ]; then
$PRINTF "$OK\n"