Accepting request 298164 from home:rudi_m:branches:network:utilities

- test-suite, use a small but safe subset of all tests
- don't remove "example" scripts from builddir, they are needed for
  tests

OBS-URL: https://build.opensuse.org/request/show/298164
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=33

socat.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 20 05:54:10 UTC 2015 - sweet_f_a@gmx.de
+
+- test-suite, use a small but safe subset of all tests
+- don't remove "example" scripts from builddir, they are needed for
+  tests
+
 -------------------------------------------------------------------
 Tue Apr 14 15:57:19 UTC 2015 - sweet_f_a@gmx.de
 

socat.spec

@@ -24,6 +24,15 @@ BuildRequires:  readline-devel
 %if 0%{?suse_version}
 BuildRequires:  tcpd-devel
 %endif
+# begin: test deps: (ip, ping, ping6, netstat, /etc/services)
+BuildRequires:  iproute2
+BuildRequires:  iputils
+BuildRequires:  netcfg
+BuildRequires:  net-tools
+%if 0%{?suse_version} >= 1310
+BuildRequires:  net-tools-deprecated
+%endif
+# end: test deps
 Version:        1.7.3.0
 Release:        0
 Url:            http://www.dest-unreach.org/socat/
@@ -56,7 +65,7 @@ export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
 %configure
 %{__make} all
 mkdir examples
-mv daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
+cp -a daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
 
 %install
 mkdir -p \
@@ -66,7 +75,16 @@ mkdir -p \
 
 %check
 export TERM=ansi
-make test || echo "TEST FAILED"
+# use a small but safe subset of all tests
+sotests="filan consistency stdio fd pipe pipes exec gopen noatime system"
+%ifnarch armv6l armv6hl aarch64
+# add some more tests for fast machines only
+sotests+=" unix"
+%endif
+# increase socket shutdown timeout, default 0.1 or 0.5 caused sometimes
+# random failures on slow machines (armv6l, aarch64)
+export OPTS="-t 2"
+./test.sh $sotests
 
 %files
 %defattr(-,root,root)