[Ocfstest-commits] colinzhu commits r32 - in
trunk/ocfs2test/src/TestSuites/ocfs2test/tset: .
tpmultibinode tpstress
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu May 12 00:47:16 CDT 2005
Author: colinzhu
Date: 2005-05-12 00:47:14 -0500 (Thu, 12 May 2005)
New Revision: 32
Modified:
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/config.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tet_scen
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/Makefile
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/basicrw
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/basicrw.c
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/directrw
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dommap
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dommap.c
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dowrite
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dowrite.c
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim2.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim3.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim4.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim5.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim6.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim7.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim8.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim9.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss1.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss2.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss3.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss4.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss5.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss6.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss7.sh
Log:
Multiple node cases and stress cases are added, which are under tet & TVS framework.
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/config.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/config.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/config.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -33,4 +33,3 @@
echo "############################Contents:#################################################"
echo
echo "After you modify the testenv.sh, setup finishes!"
-vi testenv.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -25,14 +25,24 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-REMOTE=westvile1
-TESTDIR=/ocfs/testdir
-TESTFILE="/ocfs/ocfs_locktest"
-MOUNTPOINT=/ocfs
+REMOTE=node2
+TESTDIR=/ocfs2/testdir
+TESTFILE="/ocfs2/ocfs_locktest"
+MOUNTPOINT=/ocfs2
SRCDIR=/tmp
+
+WORKDIR=/usr/tet/TVS/tsets/ocfs2test
+OCFSROOT=/oradata/ocfstest/test
+O2CBCLUSTER=sancluster
+OCFSDEV=/dev/sdb5
+
+
+
. ./testenv.sh
+OCFSDEV=$OCFS2_DEVICE
+
create_testfile(){
for (( i=0; i<100; i++))
do
@@ -41,28 +51,27 @@
}
clear_testdir(){
- rm /ocfs/* -Rf
+ rm $OCFS2_MOUNT_POINT/* -Rf
}
format_ocfs2(){
#mkfs.ocfs2 --clustersize=4096 --device=$OCFSDEV --label="ocfs2"
- mkfs.ocfs2 -b 4096 -L "ocfs2" $OCFSDEV
+ $MKFS_OCFS2_CMD -C 4096 -L "ocfs2" -x -F $OCFSDEV
}
setup()
{
- fs=`cat /proc/mounts|awk '$2=="/ocfs" {print $3}'`
+ fs=`cat /proc/mounts|awk '$2=="$OCFS2_MOUNT_POINT" {print $3}'`
if [ x$fs == x"ocfs2" ];then
return 0
fi
cat /proc/modules|grep ocfs2
if [ $? -ne 0 ];then
- load_ocfs2
+ $LOAD_OCFS2_CMD
fi
- mkdir /ocfs 2>/dev/null
+ mkdir $OCFS2_MOUNT_POINT 2>/dev/null
if [ x$NOFORMAT != xyes ];then
echo "mkfs.ocfs2 first..."
- modprobe raw
format_ocfs2
echo "mkfs.ocfs2 ok..."
fi
@@ -77,17 +86,17 @@
remotesetup()
{
- fs=`ssh $REMOTE cat /proc/mounts | awk '$2=="/ocfs" {print $3}'`
+ fs=`ssh $REMOTE cat /proc/mounts | awk '$2=="$OCFS2_MOUNT_POINT" {print $3}'`
if [ x$fs != x"ocfs2" ];then
remoterun "modprobe ext3 2>/dev/null"
remoterun "cat /proc/modules|grep ocfs2"
if [ $? -ne 0 ];then
- remoterun "load_ocfs2"
+ remoterun "$LOAD_OCFS2_CMD"
if [ $? -ne 0 ];then
- echo "Fail to mount /ocfs on ${remotenode}"
- umount /ocfs
- rmmod ocfs2
+ echo "Fail to mount $OCFS2_MOUNT_POINT on ${remotenode}"
+ umount $OCFS2_MOUNT_POINT
+ $UNLOAD_OCFS2_CMD
exit 1
fi
fi
@@ -95,27 +104,26 @@
return 0
fi
- remoterun "mkdir /ocfs 2>/dev/null"
- remoterun "modprobe raw 2>/dev/null"
+ remoterun "mkdir -p $OCFS2_MOUNT_POINT 2>/dev/null"
- remoterun "mount $OCFSDEV /ocfs -t ocfs2"
+ remoterun "mount $OCFSDEV $OCFS2_MOUNT_POINT -t ocfs2"
if [ $? -ne 0 ];then
- echo "Fail to mount /ocfs on ${remotenode}"
- remoterun "rmmod ocfs2"
- umount /ocfs
- rmmod ocfs2
+ echo "Fail to mount $OCFS2_MOUNT_POINT on ${remotenode}"
+ remoterun "$UNLOAD_OCFS2_CMD"
+ umount $OCFS2_MOUNT_POINT
+ $UNLOAD_OCFS2_CMD
exit 1
fi
}
mount_ocfs2()
{
- fs=`cat /proc/mounts|awk '$2=="/ocfs" {print $3}'`
+ fs=`cat /proc/mounts|awk '$2=="$OCFS2_MOUNT_POINT" {print $3}'`
if [ x$fs == x"ocfs2" ];then
return 0
fi
- mount $OCFSDEV /ocfs -t ocfs2
+ mount $OCFSDEV $OCFS2_MOUNT_POINT -t ocfs2
if [ $? -ne 0 ];then
return 1
fi
@@ -124,7 +132,7 @@
umount_ocfs2()
{
- fs=`cat /proc/mounts|awk '$2=="/ocfs" {print $3}'`
+ fs=`cat /proc/mounts|awk '$2=="$OCFS2_MOUNT_POINT" {print $3}'`
if [ x$fs != x"ocfs2" ];then
return 0
fi
@@ -138,7 +146,7 @@
remote_umount_ocfs2()
{
- fs=`ssh $REMOTE cat /proc/mounts|awk '$2=="/ocfs" {print $3}'`
+ fs=`ssh $REMOTE cat /proc/mounts|awk '$2=="$OCFS2_MOUNT_POINT" {print $3}'`
if [ x$fs != x"ocfs2" ];then
return 0
fi
@@ -156,3 +164,4 @@
ssh $REMOTE "$*"
}
+touch ${TESTDIR}/ocfs_locktest
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -12,7 +12,7 @@
export LOAD_OCFS2_CMD='/etc/init.d/o2cb start'
export UNLOAD_OCFS2_CMD='/etc/init.d/o2cb stop'
-export OCFS2_DEVICE='/dev/cciss/c0d0p6'
+export OCFS2_DEVICE='/dev/sda1'
export MKFS_OCFS2_CMD='mkfs.ocfs2'
export MKFS_EXT2_CMD='mkfs.ext2'
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tet_scen
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tet_scen 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tet_scen 2005-05-12 05:47:14 UTC (rev 32)
@@ -2,28 +2,16 @@
# ---------------------------------------------------------------------
# LingXiaoFeng
# ---------------------------------------------------------------------
-basic
- basic/moduleir-test.sh
- basic/setup-test.sh
- basic/remount-test.sh
- basic/basicrw-test.sh
- basic/basicdir-test.sh
- basic/basicfile-test.sh
- basic/basicdio-test.sh
+build
+ "Starting build of Example1 Suite"
+ /tset/ocfs2test/tpstress/tpstresss1.sh
+ /tset/ocfs2test/tpstress/tpstresss2.sh
+ /tset/ocfs2test/tpstress/tpstresss3.sh
+ /tset/ocfs2test/tpstress/tpstresss4.sh
+ /tset/ocfs2test/tpstress/tpstresss5.sh
+ /tset/ocfs2test/tpstress/tpstresss6.sh
+ /tset/ocfs2test/tpstress/tpstresss7.sh
+ "Example1 Suite build complete"
-coverage
- coverage/proc-test.sh
- coverage/ioctl-test.sh
- coverage/exendfile-test.sh
-
-cluster
- cluster/inode-test.sh
- cluster/rwcluster-test.sh
- cluster/lock-test.sh
-fromogfs
-
-ltp
- ltp/testall.sh
-
-ocfsts
-
+tpstress
+ /tpstress/tpstresss3.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/Makefile
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/Makefile 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/Makefile 2005-05-12 05:47:14 UTC (rev 32)
@@ -63,6 +63,7 @@
cp *.sh ${DEPTH}/tsets/ocfs2test/tpmultibinode
cp ../*.sh ${DEPTH}/tsets/ocfs2test/
cp ../test.config ${DEPTH}/tsets/ocfs2test/
+ cp ../../tet_scen ${DEPTH}/tsets/ocfs2test/
tc1: tc1.c $(INCDIR)/tet_api.h $(TVSINCDIR)/TVSFunctions.h $(TVSLIBDIR)/TVSFunctions.o
$(CC) $(CFLAGS) -o tc1 tc1.c $(TVSLIBDIR)/TVSFunctions.o $(LIBDIR)/tcm.o $(LIBDIR)/libapi.a $(SYSLIBS)
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/basicrw
===================================================================
(Binary files differ)
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/basicrw.c
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/basicrw.c 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/basicrw.c 2005-05-12 05:47:14 UTC (rev 32)
@@ -143,7 +143,7 @@
ocfsroot = getenv("OCFSROOT");
if(ocfsroot == NULL)
- ocfsroot = "/ocfs";
+ ocfsroot = "/ocfs2";
snprintf(filename, 255, "%s/ocfs_locktest", ocfsroot);
//fprintf(stderr, "the file name is %s\n",filename);
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/directrw
===================================================================
(Binary files differ)
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dommap
===================================================================
(Binary files differ)
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dommap.c
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dommap.c 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dommap.c 2005-05-12 05:47:14 UTC (rev 32)
@@ -59,7 +59,7 @@
ocfsroot = getenv("OCFSROOT");
if(ocfsroot == NULL)
- ocfsroot = "/ocfs";
+ ocfsroot = "/ocfs2";
snprintf(filename, 255, "%s/ocfs_locktest", ocfsroot);
filename[255] = 0;
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dowrite
===================================================================
(Binary files differ)
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dowrite.c
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dowrite.c 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/dowrite.c 2005-05-12 05:47:14 UTC (rev 32)
@@ -49,7 +49,7 @@
ocfsroot = getenv("OCFSROOT");
if(ocfsroot == NULL)
- ocfsroot = "/ocfs";
+ ocfsroot = "/ocfs2";
snprintf(filename, 255, "%s/ocfs_locktest", ocfsroot);
filename[255] = 0;
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -22,37 +22,37 @@
ic1=" tp1 tp2 tp3 tp4 tp5 " # functions for ic1
waittime=10
-. ../setup.sh
+. ./setup.sh
tp1()
{
tvs_test_purpose_start "testing inode for filo from different node"
clear_testdir
FF="testfile$$"
- remoterun "echo "--" > /ocfs/$FF"
+ remoterun "echo "--" > $OCFS2_MOUNT_POINT/$FF"
#sleep $waittime
- if [ -f /ocfs/$FF ];then
+ if [ -f $OCFS2_MOUNT_POINT/$FF ];then
tvs_test_purpose_finish PASS
else
tvs_test_purpose_finish FAIL
fi
- rm -f /ocfs/$FF
+ rm -f $OCFS2_MOUNT_POINT/$FF
}
tp2()
{
tvs_test_purpose_start "testing inode for dir from different node"
DD="testdir$$"
- remoterun "rm -f /ocfs/$DD"
- remoterun "mkdir /ocfs/$DD"
+ remoterun "rm -f $OCFS2_MOUNT_POINT/$DD"
+ remoterun "mkdir $OCFS2_MOUNT_POINT/$DD"
sleep $waittime
- if [ ! -d /ocfs/$DD ];then
+ if [ ! -d $OCFS2_MOUNT_POINT/$DD ];then
tet_infoline "Crete dir $DD fail on one node"
tvs_test_purpose_finish FAIL
return;
fi
tvs_test_purpose_finish PASS
- rm -fr /ocfs/$DD
+ rm -fr $OCFS2_MOUNT_POINT/$DD
}
@@ -60,48 +60,48 @@
{
tvs_test_purpose_start "testing inode for pipe from different node"
DD="testpipe$$"
- remoterun "rm -f /ocfs/$DD"
- remoterun "mknod /ocfs/$DD p"
+ remoterun "rm -f $OCFS2_MOUNT_POINT/$DD"
+ remoterun "mknod $OCFS2_MOUNT_POINT/$DD p"
sleep $waittime
- if [ ! -p /ocfs/$DD ];then
- tet_infoline "Crete pipe /ofcs2/$DD fail on one node"
+ if [ ! -p $OCFS2_MOUNT_POINT/$DD ];then
+ tet_infoline "Crete pipe $OCFS2_MOUNT_POINT/$DD fail on one node"
tvs_test_purpose_finish FAIL
return;
fi
tvs_test_purpose_finish PASS
- rm -f /ocfs/$DD
+ rm -f $OCFS2_MOUNT_POINT/$DD
}
tp4()
{
tvs_test_purpose_start "testing inode for character device from different node"
DD="testcdevice$$"
- remoterun "rm -f /ocfs/$DD"
- remoterun "mknod /ocfs/$DD c 10 10"
+ remoterun "rm -f $OCFS2_MOUNT_POINT/$DD"
+ remoterun "mknod $OCFS2_MOUNT_POINT/$DD c 10 10"
sleep $waittime
- if [ ! -c /ocfs/$DD ];then
- tet_infoline "Crete char device node /ofcs/$DD fail on one node"
+ if [ ! -c $OCFS2_MOUNT_POINT/$DD ];then
+ tet_infoline "Crete char device node $OCFS2_MOUNT_POINT/$DD fail on one node"
tvs_test_purpose_finish FAIL
return;
fi
tvs_test_purpose_finish PASS
- rm -f /ocfs/$DD
+ rm -f $OCFS2_MOUNT_POINT/$DD
}
tp5()
{
tvs_test_purpose_start "testing inode for block device from different node"
DD="testbdevice$$"
- remoterun "rm -f /ocfs/$DD"
- remoterun "mknod /ocfs/$DD b 10 10"
+ remoterun "rm -f $OCFS2_MOUNT_POINT/$DD"
+ remoterun "mknod $OCFS2_MOUNT_POINT/$DD b 10 10"
sleep $waittime
- if [ ! -b /ocfs/$DD ];then
- tet_infoline "Crete block device node /ofcs/$DD fail on one node"
+ if [ ! -b $OCFS2_MOUNT_POINT/$DD ];then
+ tet_infoline "Crete block device node $OCFS2_MOUNT_POINT/$DD fail on one node"
tvs_test_purpose_finish FAIL
return;
fi
tvs_test_purpose_finish PASS
- rm -f /ocfs/$DD
+ rm -f $OCFS2_MOUNT_POINT/$DD
}
startup() # start-up function
@@ -127,7 +127,7 @@
tet_infoline "Finish ocfs2 cluster test ..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim2.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim2.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim2.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -21,7 +21,7 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2" # functions for ic1
-. ../setup.sh
+. ./setup.sh
exec_file="./basicrw"
log_file1="log1"
@@ -101,7 +101,7 @@
tet_infoline "Finish ocfs2 basic read/write from different node test..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim3.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim3.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim3.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -23,7 +23,7 @@
ic1="tp2" # functions for ic1
-. ../setup.sh
+. ./setup.sh
size=5
exe_file="./dommap"
@@ -107,7 +107,7 @@
tet_infoline "Finish ocfs2 basic read/write from different node test..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim4.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim4.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim4.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -21,7 +21,7 @@
iclist="ic1" # list invocable components
ic1="tp1"
-. ../setup.sh
+. ./setup.sh
size=10
exe_file="./directrw"
@@ -59,7 +59,7 @@
tet_infoline "Finish ocfs2 directio test..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim5.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim5.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim5.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -21,7 +21,7 @@
iclist="ic1" # list invocable components
ic1="tp1" # functions for ic1
-. ../setup.sh
+. ./setup.sh
exec_file="./basicrw"
log_file1="/tmp/log1"
@@ -88,10 +88,10 @@
sleep 5
umount_ocfs2
- rmmod ocfs2
+ $UNLOAD_OCFS2_CMD
remote_umount_ocfs2
- remoterun "rmmod ocfs2"
+ remoterun "UNLOAD_OCFS2_CMD"
wait
@@ -121,7 +121,7 @@
tet_infoline "Finish ocfs2 file lock test from different node ..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim6.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim6.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim6.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -21,7 +21,7 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2 tp3 tp4 " # functions for ic1
-. ../setup.sh
+. ./setup.sh
loop_times=1000
@@ -114,11 +114,11 @@
tp5()
{
tvs_test_purpose_start "testing unmount after cluster write"
- umount /ocfs
+ umount $OCFS2_MOUNT_POINT
if [ $? -ne 0 ];then
tvs_test_purpose_finish FAIL
else
- remoterun "umount /ocfs"
+ remoterun "umount $OCFS2_MOUNT_POINT"
if [ $? -ne 0 ];then
tvs_test_purpose_finish FAIL
else
@@ -143,7 +143,7 @@
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim7.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim7.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim7.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -21,7 +21,7 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2 tp3 tp4 tp5 tp6 tp7 tp8 " # functions for ic1
-. ../setup.sh
+. ./setup.sh
loop_times=1000
@@ -184,11 +184,11 @@
tp9()
{
tvs_test_purpose_start "unmount after test"
- umount /ocfs
+ umount $OCFS2_MOUNT_POINT
if [ $? -ne 0 ];then
tvs_test_purpose_finish FAIL
else
- remoterun "umount /ocfs"
+ remoterun "umount $OCFS2_MOUNT_POINT"
if [ $? -ne 0 ];then
tvs_test_purpose_finish FAIL
else
@@ -213,7 +213,7 @@
tet_infoline "Finish ocfs2 dir lock test on different node test..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim8.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim8.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim8.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -21,7 +21,7 @@
iclist="ic1" # list invocable components
ic1="tp1" # functions for ic1
-. ../setup.sh
+. ./setup.sh
exec_file="./basicrw"
log_file1="log1"
@@ -98,7 +98,7 @@
tet_infoline "Finish ocfs2 file lock test from different node ..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim9.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim9.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim9.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -21,7 +21,7 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2" # functions for ic1
-. ../setup.sh
+. ./setup.sh
exec_file="./basicrw"
@@ -138,7 +138,7 @@
tet_infoline "Finish ocfs2 wrwr-file-multi test ..."
}
-. ../test.config
+. ./test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss1.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss1.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss1.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -17,16 +17,17 @@
#!/bin/sh
tet_startup="startup" # startup function
tet_cleanup="cleanup" # cleanup function
-iclist="ic1" # list invocable components
+iclist="ic1" # list invocable components
ic1="tp1 tp2" # functions for ic1
-. ../setup.sh
+WORKDIR=/usr/tet/TVS/tsets/ocfs2test
+. ${WORKDIR}/setup.sh
-exec_file="/tmp/basicrw"
+exec_file="./basicrw"
log_file1="${exec_file}_log1"
log_file2="${exec_file}_log2"
loop_times=100
-test_file=/ocfs/ocfs_locktest
+test_file=${TESTDIR}/ocfs_locktest
remote_write(){
${ssh_cmd} rm -f ${log_file2} 2>/dev/null
@@ -103,7 +104,7 @@
tet_infoline "Finish ocfs2 file lock test from different node ..."
}
-. ../test.config
+. /usr/tet/TVS/tsets/ocfs2test/test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss2.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss2.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss2.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -20,9 +20,9 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2 tp3"
-. ../setup.sh
+. /usr/tet/TVS/tsets/ocfs2test/setup.sh
-TESTDIR=/ocfs/testdir
+#TESTDIR=/oradata/ocfstest/test
loop_times=100
create_thread_1()
@@ -176,7 +176,7 @@
tet_infoline "Finish ocfs2 dir lock test by two threads on single node ..."
}
-. ../test.config
+. /usr/tet/TVS/tsets/ocfs2test/test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss3.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss3.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss3.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -20,9 +20,8 @@
iclist="ic1" # list invocable components
ic1="tp1" # functions for ic1
-. ../setup.sh
+. /usr/tet/TVS/tsets/ocfs2test/setup.sh
-TESTDIR=/ocfs/testdir
ret=
countfile(){
@@ -50,14 +49,14 @@
remoteproc()
{
- scp dirproc.sh $REMOTE:
- remoterun "./dirproc.sh $TESTDIR"
+ scp ./dirproc.sh $REMOTE:
+ remoterun "/usr/tet/TVS/tsets/ocfs2test/dirproc.sh $TESTDIR"
}
remotedel()
{
- scp dirproc.sh $REMOTE:
- remoterun "./dirproc.sh $TESTDIR del"
+ scp ./dirproc.sh $REMOTE:
+ remoterun "/usr/tet/TVS/tsets/ocfs2test/dirproc.sh $TESTDIR del"
}
localcreate()
@@ -122,11 +121,11 @@
tp3()
{
tvs_test_purpose_start "testing unmount after cluster write"
- umount /ocfs
+ umount ${MOUNTPOINT}
if [ $? -ne 0 ];then
tvs_test_purpose_finish FAIL
else
- remoterun "umount /ocfs"
+ remoterun "umount ${MOUNTPOINT}"
if [ $? -ne 0 ];then
tvs_test_purpose_finish FAIL
else
@@ -153,7 +152,7 @@
tet_infoline "Finish ocfs2 dir lock test on different node test..."
}
-. ../test.config
+. /usr/tet/TVS/tsets/ocfs2test/test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss4.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss4.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss4.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -20,7 +20,7 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2" # functions for ic1
-. ../setup.sh
+. /usr/tet/TVS/tsets/ocfs2test/setup.sh
log_file1="/tmp/basicrw_log1"
log_file2="/tmp/basicrw_log2"
@@ -30,13 +30,13 @@
localwrite()
{
rm ${log_file} 2>/dev/null
- ./basicrw -t w -o 1000 -n ${loop_times} -s "test on single node" -l ${log_file}
+ /usr/tet/TVS/tsets/ocfs2test/tpstress/basicrw -t w -o 1000 -n ${loop_times} -s "test on single node" -l ${log_file}
}
localread()
{
rm ${log_file} 2>/dev/null
- ./basicrw -t r -o 1000 -n ${loop_times} -s "test on single node" -l ${log_file}
+ /usr/tet/TVS/tsets/ocfs2test/tpstress/basicrw -t r -o 1000 -n ${loop_times} -s "test on single node" -l ${log_file}
}
tp1()
@@ -102,7 +102,7 @@
tet_infoline "Finish ocfs2 basic read/write from different node test..."
}
-. ../test.config
+. /usr/tet/TVS/tsets/ocfs2test/test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss5.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss5.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss5.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -20,7 +20,7 @@
iclist="ic1" # list invocable components
ic1="tp2" # functions for ic1
-. ../setup.sh
+. /usr/tet/TVS/tsets/ocfs2test/setup.sh
exec_file="./basicrw"
log_file1="log1"
@@ -110,7 +110,7 @@
tet_infoline "Finish ocfs2 file lock test from different node ..."
}
-. ../test.config
+. /usr/tet/TVS/tsets/ocfs2test/test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss6.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss6.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss6.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -20,22 +20,22 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2 tp3" # functions for ic1
-. ../setup.sh
+. /usr/tet/TVS/tsets/ocfs2test/setup.sh
exec_file="./basicrw"
-log_file1="/tmp/log1"
+log_file1="/tmp/basicrw_log1"
loop_times=100
ret=
local_write(){
rm -f ${log_file1} 2>/dev/null
-${exec_file} -t w -o 1000 -n ${loop_times} -s "on different nodes" -l {log_file1}
+${exec_file} -t w -o 1000 -n ${loop_times} -s "on different nodes" -l ${log_file1}
}
local_mkdir(){
for ((i=0;i<$loop_times ; i++))
do
- mkdir /ocfs/dir1-$i
+ mkdir ${TESTDIR}/dir1-$i
ret=`expr $ret + $?`
done
}
@@ -43,7 +43,7 @@
local_createfile(){
for ((i=0;i<$loop_times ; i++))
do
- touch /ocfs/file1-$i
+ touch ${TESTDIR}/file1-$i
ret=`expr $ret + $?`
done
}
@@ -128,7 +128,7 @@
tet_infoline "Finish ocfs2 basic read/write from different node test..."
}
-. ../test.config
+. /usr/tet/TVS/tsets/ocfs2test/test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss7.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss7.sh 2005-04-26 09:40:47 UTC (rev 31)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpstress/tpstresss7.sh 2005-05-12 05:47:14 UTC (rev 32)
@@ -20,24 +20,24 @@
iclist="ic1" # list invocable components
ic1="tp1 tp2 tp3" # functions for ic1
-. ../setup.sh
+. /usr/tet/TVS/tsets/ocfs2test/setup.sh
exec_file="./basicrw"
-log_file2="log2"
+log_file2="/tmp/basicrw_log2"
loop_times=100
-test_file=/ocfs/ocfs_locktest
+test_file=${TESTDIR}/ocfs_locktest
ret=0
remote_write(){
remoterun "rm -f ${log_file2} 2>/dev/null"
- remoterun "${exec_file} -t w -o 1000 -n ${loop_times} -s "on different nodes" -l {log_file2}"
+ remoterun "${exec_file} -t w -o 1000 -n ${loop_times} -s "on different nodes" -l ${log_file2}"
}
local_mkdir(){
for ((i=0;i<$loop_times ; i++))
do
- mkdir /ocfs/dir1-$i
+ mkdir -p ${TESTDIR}/dir1-$i
ret=`expr $ret + $?`
done
}
@@ -45,7 +45,7 @@
local_createfile(){
for ((i=0;i<$loop_times ; i++))
do
- touch /ocfs/file1-$i
+ touch ${TESTDIR}/file1-$i
ret=`expr $ret + $?`
done
}
@@ -129,7 +129,7 @@
tet_infoline "Finish ocfs2 file lock test from different node ..."
}
-. ../test.config
+. /usr/tet/TVS/tsets/ocfs2test/test.config
# Source TVS helper functions
. $TVS_ROOT/lib/TVSFunctions.sh
More information about the Ocfstest-commits
mailing list