rpms/socat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Skip three patches in the test suite

Browse Source 
One test (about pid and ppid) fails in mock - works fine manually
Two tests use a networked IP address for SOCKS which we cannot
reach on the build servers.
This commit is contained in:
Paul Wouters 2014-04-08 19:24:02 -04:00
parent 1262c39394
commit 491dd6aa27
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
socat-1.7.2.4-test.patch Normal file
View File

@ -0,0 +1,45 @@
--- 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-08 19:14:21.871009224 -0400
@@ -3713,11 +3713,13 @@
if [ "$MYPID" = "$MYPPID" -o "$MYPID" = "$MYPGID" -o "$MYPID" = "$MYSID" -o \
"$MYPPID" = "$MYPGID" -o "$MYPPID" = "$MYSID" -o "$MYPGID" = "$MYSID" ];
then
- $PRINTF "$FAILED:\n"
- echo "$CMD"
- cat "$te"
- numFAIL=$((numFAIL+1))
- listFAIL="$listFAIL $N"
+ $PRINTF "test $F_n $TEST... ${YELLOW}skipped - fails in mock ${NORMAL}\n" $N
+ numCANT=$((numCANT+1))
+ #$PRINTF "$FAILED:\n"
+ #echo "$CMD"
+ #cat "$te"
+ #numFAIL=$((numFAIL+1))
+ #listFAIL="$listFAIL $N"
else
$PRINTF "$OK\n"
numOK=$((numOK+1))
@@ -4218,7 +4220,11 @@
elif ! testaddrs listen tcp ip4 >/dev/null || ! runsip4 >/dev/null; then
$PRINTF "test $F_n $TEST... ${YELLOW}TCP/IPv4 not available${NORMAL}\n" $N
numCANT=$((numCANT+1))
+elif test -n "not-empty"; then
+ $PRINTF "test $F_n $TEST... ${YELLOW}TCP/IPv4 external network test skipped${NORMAL}\n" $N
+ numCANT=$((numCANT+1))
else
+# never called
tf="$td/test$N.stdout"
te="$td/test$N.stderr"
tdiff="$td/test$N.diff"
@@ -4263,7 +4269,11 @@
elif ! testaddrs listen tcp ip6 >/dev/null || ! runsip6 >/dev/null; then
$PRINTF "test $F_n $TEST... ${YELLOW}TCP/IPv6 not available${NORMAL}\n" $N
numCANT=$((numCANT+1))
+elif test -n "not-empty"; then
+ $PRINTF "test $F_n $TEST... ${YELLOW}TCP/IPv4 external network test skipped${NORMAL}\n" $N
+ numCANT=$((numCANT+1))
else
+# never called
tf="$td/test$N.stdout"
te="$td/test$N.stderr"
tdiff="$td/test$N.diff"

2
socat.spec
View File

@ -13,6 +13,7 @@ BuildRequires: openssl-devel readline-devel ncurses-devel
BuildRequires: autoconf kernel-headers > 2.6.18
# for make test
BuildRequires: iproute net-tools coreutils procps-ng openssl iputils
Patch1: socat-1.7.2.4-test.patch
%description
Socat is a relay for bidirectional data transfer between two independent data
@ -26,6 +27,7 @@ line editor (readline), a program, or a combination of two of these.
%setup -q
iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
mv CHANGES.utf8 CHANGES
%patch1 -p1
%build
%configure \