From: Cyril H. <su...@li...> - 2013-11-12 12:51:13
|
The branch, master, has been updated via 743f2fcd5744744d649496d8f0524cf5ca7d3859 (commit) from a4f5e23bb7dbbe71a52bc89b43edea35e2567382 (commit) - Log ----------------------------------------------------------------- commit 743f2fcd5744744d649496d8f0524cf5ca7d3859 Author: Simon Xu <xu....@or...> Date: Tue Nov 12 18:59:57 2013 +0800 move gethost from tools to sendfile01 Move tools/gethost.c to testcases/network/tcp_cmds/sendfile/sendfile01_gethost.c since sendfile01 is the only test that requires gethost. Signed-off-by: Simon Xu <xu....@or...> Acked-by: Cyril Hrubis <ch...@su...> ----------------------------------------------------------------------- Summary of changes: testcases/network/tcp_cmds/sendfile/Makefile | 4 ++-- testcases/network/tcp_cmds/sendfile/sendfile01 | 4 ++-- .../network/tcp_cmds/sendfile/sendfile01_gethost.c | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename tools/gethost.c => testcases/network/tcp_cmds/sendfile/sendfile01_gethost.c (100%) diff --git a/testcases/network/tcp_cmds/sendfile/Makefile b/testcases/network/tcp_cmds/sendfile/Makefile index a8b0736..7ba2d7a 100644 --- a/testcases/network/tcp_cmds/sendfile/Makefile +++ b/testcases/network/tcp_cmds/sendfile/Makefile @@ -27,9 +27,9 @@ include $(abs_srcdir)/../Makefile.inc CPPFLAGS += -I$(abs_srcdir)/../include -INSTALL_TARGETS := sendfile01 sendfile01_server +INSTALL_TARGETS := sendfile01 sendfile01_server sendfile01_gethost -MAKE_TARGETS += testsf_c testsf_s testsf_c6 testsf_s6 +MAKE_TARGETS += testsf_c testsf_s testsf_c6 testsf_s6 sendfile01_gethost testsf_c6.o testsf_s6.o: CPPFLAGS += -DINET6 diff --git a/testcases/network/tcp_cmds/sendfile/sendfile01 b/testcases/network/tcp_cmds/sendfile/sendfile01 index ba61873..ebeb182 100755 --- a/testcases/network/tcp_cmds/sendfile/sendfile01 +++ b/testcases/network/tcp_cmds/sendfile/sendfile01 @@ -59,9 +59,9 @@ do_setup() tst_setup - exists awk diff gethost grep rsh stat + exists awk diff sendfile01_gethost grep rsh stat - if ! IPADDR=$(gethost ${EXEC_SUFFIX:+6} $RHOST | awk 'BEGIN { ec=1 } /addresses:/ {print $2; ec=0 } END { exit ec }'); then + if ! IPADDR=$(sendfile01_gethost ${EXEC_SUFFIX:+6} $RHOST | awk 'BEGIN { ec=1 } /addresses:/ {print $2; ec=0 } END { exit ec }'); then # XXX (garrcoop): || exit 1 is there to prevent the test from hanging in the event of an install error. end_testcase "Failed to determine the appropriate IP address for the machine." || exit 1 fi diff --git a/tools/gethost.c b/testcases/network/tcp_cmds/sendfile/sendfile01_gethost.c similarity index 100% rename from tools/gethost.c rename to testcases/network/tcp_cmds/sendfile/sendfile01_gethost.c hooks/post-receive -- ltp |