1) Rename SF_Server to sendfile01_server to avoid collisions
2) The test always fails because SF_Server is not installed, add
   sendfile01_server into sendfile01 makefile to install it.

Signed-off-by: Simon Xu <[email protected]>
---
 testcases/network/tcp_cmds/sendfile/Makefile          | 2 +-
 testcases/network/tcp_cmds/sendfile/SF_Server         | 6 ------
 testcases/network/tcp_cmds/sendfile/sendfile01        | 2 +-
 testcases/network/tcp_cmds/sendfile/sendfile01_server | 6 ++++++
 4 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100755 testcases/network/tcp_cmds/sendfile/SF_Server
 create mode 100755 testcases/network/tcp_cmds/sendfile/sendfile01_server

diff --git a/testcases/network/tcp_cmds/sendfile/Makefile 
b/testcases/network/tcp_cmds/sendfile/Makefile
index 124ce5d..a8b0736 100644
--- a/testcases/network/tcp_cmds/sendfile/Makefile
+++ b/testcases/network/tcp_cmds/sendfile/Makefile
@@ -27,7 +27,7 @@ include $(abs_srcdir)/../Makefile.inc
 
 CPPFLAGS               += -I$(abs_srcdir)/../include
 
-INSTALL_TARGETS                := sendfile01
+INSTALL_TARGETS                := sendfile01 sendfile01_server
 
 MAKE_TARGETS           += testsf_c testsf_s testsf_c6 testsf_s6
 
diff --git a/testcases/network/tcp_cmds/sendfile/SF_Server 
b/testcases/network/tcp_cmds/sendfile/SF_Server
deleted file mode 100755
index 2383ce4..0000000
--- a/testcases/network/tcp_cmds/sendfile/SF_Server
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#set -x
-cd $3
-exec 1< /dev/null       # open descriptor 1
-exec 2< /dev/null       # open descriptor 1
-nohup ./testsf_s $1 $2 &
diff --git a/testcases/network/tcp_cmds/sendfile/sendfile01 
b/testcases/network/tcp_cmds/sendfile/sendfile01
index 46b90e2..ba61873 100755
--- a/testcases/network/tcp_cmds/sendfile/sendfile01
+++ b/testcases/network/tcp_cmds/sendfile/sendfile01
@@ -84,7 +84,7 @@ do_test()
 
     mkdir -p $TCtmp
     PORT=$$
-    if ! rsh -l root $IPADDR "$LTPROOT/testcases/bin/SF_Server $IPADDR $PORT 
$LTPROOT/testcases/bin $SERVER"; then
+    if ! rsh -l root $IPADDR "$LTPROOT/testcases/bin/sendfile01_server $IPADDR 
$PORT $LTPROOT/testcases/bin $SERVER"; then
         end_testcase "rsh failed to $IPADDR as root failed"
     fi
     sleep 10
diff --git a/testcases/network/tcp_cmds/sendfile/sendfile01_server 
b/testcases/network/tcp_cmds/sendfile/sendfile01_server
new file mode 100755
index 0000000..2383ce4
--- /dev/null
+++ b/testcases/network/tcp_cmds/sendfile/sendfile01_server
@@ -0,0 +1,6 @@
+#!/bin/sh
+#set -x
+cd $3
+exec 1< /dev/null       # open descriptor 1
+exec 2< /dev/null       # open descriptor 1
+nohup ./testsf_s $1 $2 &
-- 
1.8.4.2


------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Reply via email to