[LTP] [PATCH 04/10] network/nfs02: move to nfs_stress
Alexey Kodanev
alexey.kodanev@oracle.com
Wed Sep 30 15:09:22 CEST 2015
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
testcases/network/nfs/nfs02/Makefile | 31 ----
testcases/network/nfs/nfs02/nfs02 | 245 -----------------------------
testcases/network/nfs/nfs_stress/Makefile | 33 ++---
testcases/network/nfs/nfs_stress/nfs02 | 245 +++++++++++++++++++++++++++++
4 files changed, 259 insertions(+), 295 deletions(-)
delete mode 100644 testcases/network/nfs/nfs02/Makefile
delete mode 100755 testcases/network/nfs/nfs02/nfs02
create mode 100755 testcases/network/nfs/nfs_stress/nfs02
diff --git a/testcases/network/nfs/nfs02/Makefile b/testcases/network/nfs/nfs02/Makefile
deleted file mode 100644
index 226c481..0000000
--- a/testcases/network/nfs/nfs02/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# network/nfs/nfs02 testcases Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Garrett Cooper, July 2009
-#
-
-top_srcdir ?= ../../../..
-
-include $(top_srcdir)/include/mk/env_pre.mk
-
-INSTALL_TARGETS := nfs02
-
-MAKE_TARGETS :=
-
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/nfs/nfs02/nfs02 b/testcases/network/nfs/nfs02/nfs02
deleted file mode 100755
index c192d96..0000000
--- a/testcases/network/nfs/nfs02/nfs02
+++ /dev/null
@@ -1,245 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) International Business Machines Corp., 2001
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implie; warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# FILE : nfs02
-#
-# PURPOSE: Tests NFS copy of various filesizes, file consistency between copies
-# and preservation of write/nowrite permissions.
-#
-# SETUP: The home directory of root on the machine exported as "RHOST"
-# MUST have a ".rhosts" file with the hostname of the machine
-# where the test is executed.
-#
-#
-# HISTORY:
-# 05/15/01 Robbie Williamson (robbiew@us.ibm.com)
-# -Ported
-#
-#**********************************************************************
-
-#Uncomment line below for debug output.
-#trace_logic=${trace_logic:-"set -x"}
-
-$trace_logic
-
-#-----------------------------------------------------------------------
-# Initialize local variables
-#-----------------------------------------------------------------------
-
-TC=nfs02
-TCbin=${TCbin:=`pwd`}
-TCdat=${TCdat:=$TCbin/datafiles}
-TCsrc=${TCsrc:=$TCbin}
-TCtmp=${TCtmp:=$TCbin/$TC$$}
-export TCID=$TC
-export TST_TOTAL=1
-export TST_COUNT=1
-
-PID=$$
-
-RHOST=${RHOST:=`hostname`}
-VERSION=${VERSION:=3}
-SOCKET_TYPE=${SOCKET_TYPE:=udp}
-TESTDIR=${TESTDIR:=/tmp/$TC$PID.testdir}
-CLEANUP=${CLEANUP:="ON"}
-NFS_TYPE=${NFS_TYPE:=nfs}
-
-#---------------------------------------------------------------------#
-# FUNCTION: do_setup
-# PURPOSE: To create the necessary files to carry out the test
-# INPUT: None.
-# OUTPUT: None.
-#---------------------------------------------------------------------#
-do_setup()
-{
-$trace_logic
-
- echo "do_setup $TC"
-
- echo ""
- echo "Test Options:"
- echo " VERSION: $VERSION"
- echo " RHOST: $RHOST"
- echo " SOCKET_TYPE: $SOCKET_TYPE"
- echo " NFS_TYPE: $NFS_TYPE"
- echo " TESTDIR: $TESTDIR"
-
- if [ "x$NFS_TYPE" != "xnfs4" ]; then
- OPTS="-o vers=$VERSION,proto=$SOCKET_TYPE"
- fi
-
- IAM=${IAM:=`whoami`}
- [ $IAM = "root" ] || end_testcase "Must be root user"
-
- #Setup and Export the data directory on RHOST
- rsh -n $RHOST "mkdir -p $TESTDIR"
- [ $? -eq 0 ] || end_testcase "Could not create $TESTDIR from $RHOST"
-
- if [ "x$NFS_TYPE" = "xnfs4" ]; then
- rsh -n $RHOST "mkdir -p /export$TESTDIR"
- [ $? = 0 ] || end_testcase "Could not create /export$TESTDIR on server"
- rsh -n $RHOST "mount --bind $TESTDIR /export$TESTDIR"
- [ $? = 0 ] || end_testcase "Could notbind $TESTDIR to /export"
- rsh -n $RHOST "/usr/sbin/exportfs -o no_root_squash,rw,nohide,insecure,no_subtree_check *:$TESTDIR"
- [ $? = 0 ] || end_testcase "Could not export remote directory"
- else
- rsh -n $RHOST "/usr/sbin/exportfs -i *:$TESTDIR -o rw,no_root_squash "
- [ $? -eq 0 ] || end_testcase "Could not export $TESTDIR from $RHOST"
- fi
-
- #Verify export
- showmount -e $RHOST | grep $TESTDIR
- [ $? -eq 0 ] || end_testcase "$TESTDIR not exported"
-
- #Create $TCtmp for mount point
- mkdir -p $TCtmp
- [ $? -eq 0 ] || end_testcase "Could not create $TCtmp"
-
- #Mount $TCdat from RHOST.
- mount -t $NFS_TYPE $OPTS $RHOST:$TESTDIR $TCtmp
- [ $? -eq 0 ] || end_testcase "Could not mount from $RHOST"
-
-}
-
-
-#---------------------------------------------------------------------#
-# FUNCTION: do_test1
-# PURPOSE: Perform the necessary steps to complete the test.
-# INPUT: None.
-# OUTPUT: Error messages are logged if any of the tests fail.
-#---------------------------------------------------------------------#
-do_test1()
-{
-$trace_logic
- echo "do_test1 $TC "
- cp $TCdat/ascii.jmb $TCtmp &
- wait $!
- echo "compare both ascii.jmbs"
- diff $TCtmp/ascii.jmb $TCdat/ascii.jmb
- [ $? -eq 0 ] || end_testcase "'diff' of ascii.jmb FAILED"
-
-}
-
-#---------------------------------------------------------------------#
-# FUNCTION: do_test2
-# PURPOSE: Perform the necessary steps to complete the test.
-# INPUT: None.
-# OUTPUT: Error messages are logged if any of the tests fail.
-#---------------------------------------------------------------------#
-do_test2()
-{
-$trace_logic
- echo "do_test2 $TC "
- cp $TCdat/ascii.sm $TCtmp &
- wait $!
- cp $TCdat/ascii.med $TCtmp &
- wait $!
- cp $TCdat/ascii.lg $TCtmp &
- wait $!
-
- #small file
- cp $TCtmp/ascii.sm $TCtmp/ascii.smcp &
- wait $!
- diff $TCtmp/ascii.smcp $TCdat/ascii.sm
- [ $? -eq 0 ] || end_testcase "'diff' of ascii.sm FAILED"
-
- #medium file
- cp $TCtmp/ascii.med $TCtmp/ascii.medcp &
- wait $!
- diff $TCtmp/ascii.medcp $TCdat/ascii.med
- [ $? -eq 0 ] || end_testcase "'diff' of ascii.med FAILED"
-
- #large file
- cp $TCtmp/ascii.lg $TCtmp/ascii.lgcp &
- wait $!
- diff $TCtmp/ascii.lgcp $TCdat/ascii.lg
- [ $? -eq 0 ] || end_testcase "'diff' of ascii.lg FAILED"
-
-}
-
-#---------------------------------------------------------------------#
-# FUNCTION: do_test3
-# PURPOSE: Perform the necessary steps to complete the test.
-# INPUT: None.
-# OUTPUT: Error messages are logged if any of the tests fail.
-#---------------------------------------------------------------------#
-do_test3()
-{
-$trace_logic
- echo "do_test3 $TC "
- chmod a-wx $TCtmp/ascii.sm &
- wait $!
- ls -l $TCtmp/ascii.sm | grep "r--"
- [ $? -eq 0 ] || end_testcase "Removal of write permissions not honored on ascii.sm"
- chmod a+w $TCtmp/ascii.sm
-}
-
-#---------------------------------------------------------------------#
-# FUNCTION: do_cleanup
-# PURPOSE: To delete all the files created to run this test.
-# INPUT: None.
-# OUTPUT: None.
-#---------------------------------------------------------------------#
-do_cleanup()
-{
-$trace_logic
- echo "do_cleanup $TC "
- rm -f $TCtmp/*.fil*
- cd $TCbin
- umount $TCtmp
- sleep 3
- rmdir $TCtmp
- rsh -n $RHOST "/usr/sbin/exportfs -u *:$TESTDIR"
- rsh -n $RHOST "rm -rf $TESTDIR"
-}
-
-#=============================================================================
-# FUNCTION NAME: end_testcase
-#
-# FUNCTION DESCRIPTION: Clean up
-#
-# PARAMETERS: None.
-#
-# RETURNS: None.
-#=============================================================================
-end_testcase()
-{
-$trace_logic
- if [ "$CLEANUP" = "ON" ]; then
- do_cleanup
- fi
-
- [ $# = 0 ] && { tst_resm TPASS "Test Successful"; exit 0; }
- tst_resm TFAIL "Test Failed: $@"
- exit 1
-}
-
-#=============================================================================
-#---------------------------------------------------------------------#
-# FUNCTION: MAIN
-# PURPOSE: To invoke the functions to perform the tasks described in
-# the prologue.
-# INPUT: None.
-# OUTPUT: A testcase run log with the results of the execution of this
-# test.
-#---------------------------------------------------------------------#
-do_setup
-do_test1
-do_test2
-do_test3
-end_testcase
diff --git a/testcases/network/nfs/nfs_stress/Makefile b/testcases/network/nfs/nfs_stress/Makefile
index 58e24d0..ff61dfb 100644
--- a/testcases/network/nfs/nfs_stress/Makefile
+++ b/testcases/network/nfs/nfs_stress/Makefile
@@ -1,30 +1,25 @@
+# Copyright (c) 2015 Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (C) 2009, Cisco Systems Inc.
#
-# network/nfs/nfs01 testcases Makefile.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Garrett Cooper, July 2009
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/env_pre.mk
INSTALL_TARGETS := nfs_lib.sh \
- nfs01
+ nfs01 \
+ nfs02
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/nfs/nfs_stress/nfs02 b/testcases/network/nfs/nfs_stress/nfs02
new file mode 100755
index 0000000..c192d96
--- /dev/null
+++ b/testcases/network/nfs/nfs_stress/nfs02
@@ -0,0 +1,245 @@
+#! /bin/sh
+#
+# Copyright (c) International Business Machines Corp., 2001
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implie; warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+# the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# FILE : nfs02
+#
+# PURPOSE: Tests NFS copy of various filesizes, file consistency between copies
+# and preservation of write/nowrite permissions.
+#
+# SETUP: The home directory of root on the machine exported as "RHOST"
+# MUST have a ".rhosts" file with the hostname of the machine
+# where the test is executed.
+#
+#
+# HISTORY:
+# 05/15/01 Robbie Williamson (robbiew@us.ibm.com)
+# -Ported
+#
+#**********************************************************************
+
+#Uncomment line below for debug output.
+#trace_logic=${trace_logic:-"set -x"}
+
+$trace_logic
+
+#-----------------------------------------------------------------------
+# Initialize local variables
+#-----------------------------------------------------------------------
+
+TC=nfs02
+TCbin=${TCbin:=`pwd`}
+TCdat=${TCdat:=$TCbin/datafiles}
+TCsrc=${TCsrc:=$TCbin}
+TCtmp=${TCtmp:=$TCbin/$TC$$}
+export TCID=$TC
+export TST_TOTAL=1
+export TST_COUNT=1
+
+PID=$$
+
+RHOST=${RHOST:=`hostname`}
+VERSION=${VERSION:=3}
+SOCKET_TYPE=${SOCKET_TYPE:=udp}
+TESTDIR=${TESTDIR:=/tmp/$TC$PID.testdir}
+CLEANUP=${CLEANUP:="ON"}
+NFS_TYPE=${NFS_TYPE:=nfs}
+
+#---------------------------------------------------------------------#
+# FUNCTION: do_setup
+# PURPOSE: To create the necessary files to carry out the test
+# INPUT: None.
+# OUTPUT: None.
+#---------------------------------------------------------------------#
+do_setup()
+{
+$trace_logic
+
+ echo "do_setup $TC"
+
+ echo ""
+ echo "Test Options:"
+ echo " VERSION: $VERSION"
+ echo " RHOST: $RHOST"
+ echo " SOCKET_TYPE: $SOCKET_TYPE"
+ echo " NFS_TYPE: $NFS_TYPE"
+ echo " TESTDIR: $TESTDIR"
+
+ if [ "x$NFS_TYPE" != "xnfs4" ]; then
+ OPTS="-o vers=$VERSION,proto=$SOCKET_TYPE"
+ fi
+
+ IAM=${IAM:=`whoami`}
+ [ $IAM = "root" ] || end_testcase "Must be root user"
+
+ #Setup and Export the data directory on RHOST
+ rsh -n $RHOST "mkdir -p $TESTDIR"
+ [ $? -eq 0 ] || end_testcase "Could not create $TESTDIR from $RHOST"
+
+ if [ "x$NFS_TYPE" = "xnfs4" ]; then
+ rsh -n $RHOST "mkdir -p /export$TESTDIR"
+ [ $? = 0 ] || end_testcase "Could not create /export$TESTDIR on server"
+ rsh -n $RHOST "mount --bind $TESTDIR /export$TESTDIR"
+ [ $? = 0 ] || end_testcase "Could notbind $TESTDIR to /export"
+ rsh -n $RHOST "/usr/sbin/exportfs -o no_root_squash,rw,nohide,insecure,no_subtree_check *:$TESTDIR"
+ [ $? = 0 ] || end_testcase "Could not export remote directory"
+ else
+ rsh -n $RHOST "/usr/sbin/exportfs -i *:$TESTDIR -o rw,no_root_squash "
+ [ $? -eq 0 ] || end_testcase "Could not export $TESTDIR from $RHOST"
+ fi
+
+ #Verify export
+ showmount -e $RHOST | grep $TESTDIR
+ [ $? -eq 0 ] || end_testcase "$TESTDIR not exported"
+
+ #Create $TCtmp for mount point
+ mkdir -p $TCtmp
+ [ $? -eq 0 ] || end_testcase "Could not create $TCtmp"
+
+ #Mount $TCdat from RHOST.
+ mount -t $NFS_TYPE $OPTS $RHOST:$TESTDIR $TCtmp
+ [ $? -eq 0 ] || end_testcase "Could not mount from $RHOST"
+
+}
+
+
+#---------------------------------------------------------------------#
+# FUNCTION: do_test1
+# PURPOSE: Perform the necessary steps to complete the test.
+# INPUT: None.
+# OUTPUT: Error messages are logged if any of the tests fail.
+#---------------------------------------------------------------------#
+do_test1()
+{
+$trace_logic
+ echo "do_test1 $TC "
+ cp $TCdat/ascii.jmb $TCtmp &
+ wait $!
+ echo "compare both ascii.jmbs"
+ diff $TCtmp/ascii.jmb $TCdat/ascii.jmb
+ [ $? -eq 0 ] || end_testcase "'diff' of ascii.jmb FAILED"
+
+}
+
+#---------------------------------------------------------------------#
+# FUNCTION: do_test2
+# PURPOSE: Perform the necessary steps to complete the test.
+# INPUT: None.
+# OUTPUT: Error messages are logged if any of the tests fail.
+#---------------------------------------------------------------------#
+do_test2()
+{
+$trace_logic
+ echo "do_test2 $TC "
+ cp $TCdat/ascii.sm $TCtmp &
+ wait $!
+ cp $TCdat/ascii.med $TCtmp &
+ wait $!
+ cp $TCdat/ascii.lg $TCtmp &
+ wait $!
+
+ #small file
+ cp $TCtmp/ascii.sm $TCtmp/ascii.smcp &
+ wait $!
+ diff $TCtmp/ascii.smcp $TCdat/ascii.sm
+ [ $? -eq 0 ] || end_testcase "'diff' of ascii.sm FAILED"
+
+ #medium file
+ cp $TCtmp/ascii.med $TCtmp/ascii.medcp &
+ wait $!
+ diff $TCtmp/ascii.medcp $TCdat/ascii.med
+ [ $? -eq 0 ] || end_testcase "'diff' of ascii.med FAILED"
+
+ #large file
+ cp $TCtmp/ascii.lg $TCtmp/ascii.lgcp &
+ wait $!
+ diff $TCtmp/ascii.lgcp $TCdat/ascii.lg
+ [ $? -eq 0 ] || end_testcase "'diff' of ascii.lg FAILED"
+
+}
+
+#---------------------------------------------------------------------#
+# FUNCTION: do_test3
+# PURPOSE: Perform the necessary steps to complete the test.
+# INPUT: None.
+# OUTPUT: Error messages are logged if any of the tests fail.
+#---------------------------------------------------------------------#
+do_test3()
+{
+$trace_logic
+ echo "do_test3 $TC "
+ chmod a-wx $TCtmp/ascii.sm &
+ wait $!
+ ls -l $TCtmp/ascii.sm | grep "r--"
+ [ $? -eq 0 ] || end_testcase "Removal of write permissions not honored on ascii.sm"
+ chmod a+w $TCtmp/ascii.sm
+}
+
+#---------------------------------------------------------------------#
+# FUNCTION: do_cleanup
+# PURPOSE: To delete all the files created to run this test.
+# INPUT: None.
+# OUTPUT: None.
+#---------------------------------------------------------------------#
+do_cleanup()
+{
+$trace_logic
+ echo "do_cleanup $TC "
+ rm -f $TCtmp/*.fil*
+ cd $TCbin
+ umount $TCtmp
+ sleep 3
+ rmdir $TCtmp
+ rsh -n $RHOST "/usr/sbin/exportfs -u *:$TESTDIR"
+ rsh -n $RHOST "rm -rf $TESTDIR"
+}
+
+#=============================================================================
+# FUNCTION NAME: end_testcase
+#
+# FUNCTION DESCRIPTION: Clean up
+#
+# PARAMETERS: None.
+#
+# RETURNS: None.
+#=============================================================================
+end_testcase()
+{
+$trace_logic
+ if [ "$CLEANUP" = "ON" ]; then
+ do_cleanup
+ fi
+
+ [ $# = 0 ] && { tst_resm TPASS "Test Successful"; exit 0; }
+ tst_resm TFAIL "Test Failed: $@"
+ exit 1
+}
+
+#=============================================================================
+#---------------------------------------------------------------------#
+# FUNCTION: MAIN
+# PURPOSE: To invoke the functions to perform the tasks described in
+# the prologue.
+# INPUT: None.
+# OUTPUT: A testcase run log with the results of the execution of this
+# test.
+#---------------------------------------------------------------------#
+do_setup
+do_test1
+do_test2
+do_test3
+end_testcase
--
1.7.1
More information about the Ltp
mailing list