[Ocfstest-commits] mmatsuna commits r55 - in trunk: Docs bin
ocfs2test/src/TestSuites/ocfs2test/tset
ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode
ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Jul 26 15:20:48 CDT 2005
Author: mmatsuna
Date: 2005-07-26 15:20:46 -0500 (Tue, 26 Jul 2005)
New Revision: 55
Modified:
trunk/Docs/README.ocfs2test
trunk/bin/auto_test_ocfs2.sh
trunk/bin/config_files.sh
trunk/bin/config_ocfs2.sh
trunk/bin/manual_test_ocfs2.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/runtest.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/test.config
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tet_scen
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/Makefile
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/config.status
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/testenv.sh
trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tvs_list
Log:
Updated some of the files to support different device name on remote node.
Modified: trunk/Docs/README.ocfs2test
===================================================================
--- trunk/Docs/README.ocfs2test 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/Docs/README.ocfs2test 2005-07-26 20:20:46 UTC (rev 55)
@@ -37,11 +37,15 @@
# svn checkout http://oss.oracle.com/projects/ocfstest/src/trunk/ /opt/ocfs2test
-2, Setup password-less ssh login between testing nodes in one cluster according to Appendix A.
+2. Set the environment variable OCFS2BASE to the directory where ocfstest was extracted.
+# export OCFS2BASE=/opt/ocfs2test
+
+3, Setup password-less ssh login between testing nodes in one cluster according to Appendix A.
+
This is needed for multiple-node test cases.
-3, Enter ocfs2test bin directory and finish configuration task (finish all the "make" needed and build some other files needed)
+4, Enter ocfs2test bin directory and finish configuration task (finish all the "make" needed and build some other files needed)
[root at node2 opt]# cd /opt/ocfs2test/bin
[root at node2 bin]# ls
@@ -53,13 +57,13 @@
And it will build all the source need to be made. And brought the contents of the configuration file to your screen (which locates at </opt/ocfs2test>/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh|setup.sh|test.config). Modify the settings in this file to be suitable for your environment if you need.
-4, Still in the bin directory, start the automatic testing:
+5, Still in the bin directory, start the automatic testing:
[root at node2 bin]# ./auto_test_ocfs2.sh
And wait for some time until all the cases are done.
-5, After all the cases done, report for all the cases will be displayed on screen. But you can still find it at </opt/ocfs2test>/ocfs2test/src/TestSuites/ocfs2test/tset/log if you missed screen output.
+6, After all the cases done, report for all the cases will be displayed on screen. But you can still find it at </opt/ocfs2test>/ocfs2test/src/TestSuites/ocfs2test/tset/log if you missed screen output.
============================================================================================================
Modified: trunk/bin/auto_test_ocfs2.sh
===================================================================
--- trunk/bin/auto_test_ocfs2.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/bin/auto_test_ocfs2.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -1,5 +1,6 @@
#!/bin/bash
-cd ../ocfs2test/src/TestSuites/ocfs2test/tset/
+OCFS2BASE=${OCFS2BASE:?"OCFS2BASE variable was not set. Please set."}
+cd ${OCFS2BASE}/ocfs2test/src/TestSuites/ocfs2test/tset/
./runtest.sh
Modified: trunk/bin/config_files.sh
===================================================================
--- trunk/bin/config_files.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/bin/config_files.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -1,12 +1,16 @@
#!/bin/bash
-echo "Modify configuration files for ocs2test to be suitable for your environment."
-echo "Press Enter to continue ... ..."
+echo -e "Modify configuration files for ocs2test to be suitable for your environment."
+echo -e "\n\nPlease, set the environment variable OCFS2BASE to the base directory "
+echo -e " where ocfstest is loaded (i.e.: /opt/ocfstest)."
+echo -e "/nPress Enter to continue ... ..."
read
-vi ../ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh
-vi ../ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh
-vi ../ocfs2test/src/TestSuites/ocfs2test/tset/test.config
+OCFS2BASE=${OCFS2BASE:?"OCFS2BASE variable was not set. Please set."}
+vi ${OCFS2BASE}/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh
+vi ${OCFS2BASE}/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh
+vi ${OCFS2BASE}/ocfs2test/src/TestSuites/ocfs2test/tset/test.config
+
echo "Run config_ocfs2.sh for the next step to build ocfs2test suites."
Modified: trunk/bin/config_ocfs2.sh
===================================================================
--- trunk/bin/config_ocfs2.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/bin/config_ocfs2.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -1,6 +1,8 @@
#!/bin/bash
-cd ../ocfs2test/src/TestSuites/ocfs2test/tset/
+OCFS2BASE=${OCFS2BASE:?"OCFS2BASE variable was not set. Please set."}
+
+cd ${OCFS2BASE}/ocfs2test/src/TestSuites/ocfs2test/tset/
./config.sh
echo "Run auto_test_ocfs2.sh for the next step to test automatically."
Modified: trunk/bin/manual_test_ocfs2.sh
===================================================================
--- trunk/bin/manual_test_ocfs2.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/bin/manual_test_ocfs2.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -1,5 +1,7 @@
#!/bin/bash
-cd ../ocfs2test/src/TestSuites/ocfs2test/tset/
+OCFS2BASE=${OCFS2BASE:?"OCFS2BASE variable was not set. Please set."}
+
+cd ${OCFS2BASE}/ocfs2test/src/TestSuites/ocfs2test/tset/
./manual_test.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/runtest.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/runtest.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/runtest.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -29,6 +29,7 @@
mount -t ocfs2 $OCFS2_DEVICE $OCFS2_MOUNT_POINT
cp -R tpsingleltp $OCFS2_MOUNT_POINT
+cp `pwd`/testenv.sh $OCFS2_MOUNT_POINT
cd $OCFS2_MOUNT_POINT/tpsingleltp
./runocfs2
cd -
@@ -36,17 +37,18 @@
cp /tmp/tpsingleltp_output log/
rm -Rf $OCFS2_MOUNT_POINT/tpsingleltp
-$UNLOAD_OCFS2_CMD
+# $UNLOAD_OCFS2_CMD
echo
echo ">=================Multinode Cases (R/M/S) Starts!=======================<"
echo
echo "Starts from `date`"
-cp -Rf ../../../../src/ /usr/tet/TVS/
+cp -Rf $OCFS2BASE/ocfs2test/src/ /usr/tet/TVS/
cd /usr/tet/TVS/src/TestSuites/ocfs2test/tset
+rm -f /usr/tet/TVS/src/TestSuites/ocfs2test/tset/log/*
make
cd -
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/setup.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -25,7 +25,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-export REMOTE=node2
+export REMOTE=ca-test33
export TESTDIR=/ocfs2test/testdir
export TESTFILE="/ocfs2test/ocfs_locktest"
export MOUNTPOINT=/ocfs2test
@@ -34,8 +34,9 @@
export WORKDIR=/usr/tet/TVS/tsets/ocfs2test
export OCFSROOT=/ocfs2test
-export O2CBCLUSTER=nfscluster
-export OCFSDEV=/dev/sda2
+export O2CBCLUSTER=cacl
+export OCFSDEV=/dev/sdf1
+export OCFSREMOTEDEV=/dev/sdd1
export NOFORMAT=yes
@@ -56,7 +57,7 @@
format_ocfs2(){
#mkfs.ocfs2 --clustersize=4096 --device=$OCFSDEV --label="ocfs2"
- $MKFS_OCFS2_CMD -C 4096 -L "ocfs2" -x -F $OCFSDEV
+ $MKFS_OCFS2_CMD -C 4096 -L $OCFS2LABEL -x -F $OCFSDEV
}
setup()
@@ -106,7 +107,7 @@
remoterun "mkdir -p $OCFS2_MOUNT_POINT 2>/dev/null"
- remoterun "mount $OCFSDEV $OCFS2_MOUNT_POINT -t ocfs2"
+ remoterun "mount $OCFSREMOTEDEV $OCFS2_MOUNT_POINT -t ocfs2"
if [ $? -ne 0 ];then
echo "Fail to mount $OCFS2_MOUNT_POINT on ${remotenode}"
remoterun "$UNLOAD_OCFS2_CMD"
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/test.config
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/test.config 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/test.config 2005-07-26 20:20:46 UTC (rev 55)
@@ -1,2 +1,3 @@
#make OCFSDEV your test partition of ocfs2 file system
-OCFSDEV=/dev/sda2
+OCFSDEV=/dev/sdf1
+OCFSREMOTEDEV=/dev/sdd1
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/testenv.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -9,10 +9,11 @@
#
# TODO : Maybe add judgement of root here?
-export LOAD_OCFS2_CMD='/etc/init.d/o2cb start'
+export LOAD_OCFS2_CMD='/etc/init.d/o2cb online'
export UNLOAD_OCFS2_CMD='/etc/init.d/o2cb stop'
-export OCFS2_DEVICE='/dev/sda2'
+export OCFS2_DEVICE='/dev/sdf1'
+export OCFS2_REMOTE_DEVICE='/dev/sdd1'
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-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tet_scen 2005-07-26 20:20:46 UTC (rev 55)
@@ -172,6 +172,10 @@
"Starting OCFSv2 Testing Suite Database scenario"
"OCFSv2 Testing Suite Database scenario complete"
+EndTest
+ "Cleaning up"
+ /remoteclean.sh
+ "Cleaning up complete"
#crash_demo
# "Starting crash retry demo scenario"
# /test2/tc2.sh
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpmultibinode/tpmultibim1.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -15,7 +15,7 @@
#**
#*******************************************************************************
#******************************************************************************
-#!/bin/sh
+#!/bin/sh -x
tet_startup="startup" # startup function
tet_cleanup="cleanup" # cleanup function
iclist="ic1" # list invocable components
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/Makefile
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/Makefile 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/Makefile 2005-07-26 20:20:46 UTC (rev 55)
@@ -38,10 +38,10 @@
pkgincludedir = $(includedir)/ocfs2test
top_builddir = .
-ACLOCAL = ${SHELL} /home/bde/src/try/ocfs2test/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /home/bde/src/try/ocfs2test/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/bde/src/try/ocfs2test/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /home/bde/src/try/ocfs2test/missing --run autoheader
+ACLOCAL = ${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run autoconf
+AUTOMAKE = ${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run autoheader
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
@@ -63,7 +63,7 @@
EXEEXT =
OBJEXT = o
PATH_SEPARATOR = :
-AMTAR = ${SHELL} /home/bde/src/try/ocfs2test/missing --run tar
+AMTAR = ${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run tar
AWK = gawk
CC = gcc
DEPDIR = .deps
@@ -73,7 +73,7 @@
VERSION = 0.2
am__include = include
am__quote =
-install_sh = /home/bde/src/try/ocfs2test/install-sh
+install_sh = /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/install-sh
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = tpsinglebasicb8 tpsinglebasicb9 tpsinglebasicb10 tpsinglebasicb12 tpsinglebasicb13 tpsinglebasicb13_2 tpsinglebasicb14
tpsinglebasicb8_SOURCES = tpsinglebasicb8.c error.c
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/config.status
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/config.status 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/config.status 2005-07-26 20:20:46 UTC (rev 55)
@@ -478,13 +478,13 @@
s, at INSTALL_DATA@,${INSTALL} -m 644,;t t
s, at PACKAGE@,ocfs2test,;t t
s, at VERSION@,0.2,;t t
-s, at ACLOCAL@,${SHELL} /home/bde/src/try/ocfs2test/missing --run aclocal-1.6,;t t
-s, at AUTOCONF@,${SHELL} /home/bde/src/try/ocfs2test/missing --run autoconf,;t t
-s, at AUTOMAKE@,${SHELL} /home/bde/src/try/ocfs2test/missing --run automake-1.6,;t t
-s, at AUTOHEADER@,${SHELL} /home/bde/src/try/ocfs2test/missing --run autoheader,;t t
-s, at MAKEINFO@,${SHELL} /home/bde/src/try/ocfs2test/missing --run makeinfo,;t t
-s, at AMTAR@,${SHELL} /home/bde/src/try/ocfs2test/missing --run tar,;t t
-s, at install_sh@,/home/bde/src/try/ocfs2test/install-sh,;t t
+s, at ACLOCAL@,${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run aclocal-1.6,;t t
+s, at AUTOCONF@,${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run autoconf,;t t
+s, at AUTOMAKE@,${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run automake-1.6,;t t
+s, at AUTOHEADER@,${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run autoheader,;t t
+s, at MAKEINFO@,${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run makeinfo,;t t
+s, at AMTAR@,${SHELL} /opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/missing --run tar,;t t
+s, at install_sh@,/opt/ocfstest/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/install-sh,;t t
s, at STRIP@,,;t t
s, at ac_ct_STRIP@,,;t t
s, at INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/testenv.sh
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/testenv.sh 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tpsinglebasic/testenv.sh 2005-07-26 20:20:46 UTC (rev 55)
@@ -9,15 +9,16 @@
#
# TODO : Maybe add judgement of root here?
-export LOAD_OCFS2_CMD='/etc/init.d/o2cb online cacl'
-export UNLOAD_OCFS2_CMD='/etc/init.d/o2cb stop cacl'
+export LOAD_OCFS2_CMD='/etc/init.d/o2cb online'
+export UNLOAD_OCFS2_CMD='/etc/init.d/o2cb stop'
-export OCFS2_DEVICE='/dev/sdd1'
+export OCFS2_DEVICE='/dev/sdf1'
+export OCFS2_REMOTE_DEVICE='/dev/sdd1'
export MKFS_OCFS2_CMD='mkfs.ocfs2'
export MKFS_EXT2_CMD='mkfs.ext2'
export OCFS2_MOUNT_POINT='/ocfs2test'
-export OCFS2LABEL='ocfs2test'
+export OCFS2LABEL=ocfs2test
export FSCK_OCFS2_CMD='fsck.ocfs2'
Modified: trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tvs_list
===================================================================
--- trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tvs_list 2005-07-11 23:15:05 UTC (rev 54)
+++ trunk/ocfs2test/src/TestSuites/ocfs2test/tset/tvs_list 2005-07-26 20:20:46 UTC (rev 55)
@@ -1,3 +1,3 @@
-ocfs2 tpdatabase tpmultibinode tpmultiotf tpsinglebasic tpsingledb tpsingleltp tpsingleogfs tpsingleopts tpstress
+ocfs2 tpdatabase tpmultibinode tpmultiotf tpsinglebasic tpsingledb tpsingleltp tpsingleogfs tpsingleopts tpstress EndTest
More information about the Ocfstest-commits
mailing list