[PATCH] [linux] Skip unix socket/ipv4 tests if nc does not work

Gbp-Pq: Name netcat.patch

diff --git a/lib/dialects/linux/tests/case-10-ux-socket-state.bash b/lib/dialects/linux/tests/case-10-ux-socket-state.bash
index d47e53ad3f671b306296ebe1ac28061bc230b9ba..852bc796e64508e562d0fd53d027e7c1275d79c7 100755 (executable)
--- a/lib/dialects/linux/tests/case-10-ux-socket-state.bash
+++ b/lib/dialects/linux/tests/case-10-ux-socket-state.bash
@@ -11,6 +11,11 @@ if [ -z "$(nc -h 2>&1 | grep '\-U')" ]; then
     exit 77
 fi
 
+if [ -z "$(nc -h 2>&1 | grep '\-U')" ]; then
+    echo "nc does not support unix socket" >> $report
+    exit 2
+fi
+
 ux=/tmp/$name-$$.sock
 nc -l -U $ux > /dev/null < /dev/zero &
 server=$!

diff --git a/lib/dialects/linux/tests/case-20-inet-socket-endpoint.bash b/lib/dialects/linux/tests/case-20-inet-socket-endpoint.bash
index a0a652f501d4d4bb5407d785fc3ca1d84715f15c..38b8e854c8adb20f88e98988288cb4abef2c29cc 100755 (executable)
--- a/lib/dialects/linux/tests/case-20-inet-socket-endpoint.bash
+++ b/lib/dialects/linux/tests/case-20-inet-socket-endpoint.bash
@@ -6,6 +6,11 @@ if [ -z "$(nc -h 2>&1 | grep '\s\-4')" ]; then
     exit 77
 fi
 
+if [ -z "$(nc -h 2>&1 | grep '\s\-4')" ]; then
+    echo "nc does not support -4 option" >> $report
+    exit 2
+fi
+
 nc -l -4 127.0.0.1 10000 > /dev/null < /dev/zero &
 server=$!
 sleep 1

diff --git a/lib/dialects/linux/tests/case-20-ux-socket-endpoint.bash b/lib/dialects/linux/tests/case-20-ux-socket-endpoint.bash
index 50acf1349febddac987f600a2e0ffccf0a829a81..b8295a3415810d8d2145b2f2fd94c3465e078f26 100755 (executable)
--- a/lib/dialects/linux/tests/case-20-ux-socket-endpoint.bash
+++ b/lib/dialects/linux/tests/case-20-ux-socket-endpoint.bash
@@ -6,6 +6,11 @@ if [ -z "$(nc -h 2>&1 | grep '\-U')" ]; then
     exit 77
 fi
 
+if [ -z "$(nc -h 2>&1 | grep '\-U')" ]; then
+    echo "nc does not support unix socket" >> $report
+    exit 2
+fi
+
 ux=/tmp/$name-$$.sock
 nc -l -U $ux > /dev/null < /dev/zero &
 server=$!