From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 13 Nov 2009 00:44:35 +0000 (-0800)
Subject: qa: prepare for a hierarchical test script system
X-Git-Tag: v0.18~98^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=565448b5bd255332fbed587761d75d84e395023f;p=ceph.git

qa: prepare for a hierarchical test script system
---

diff --git a/qa/client/1.sh b/qa/client/1.sh
deleted file mode 100755
index 89eed2e8c5e0..000000000000
--- a/qa/client/1.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-basedir=`echo $0 | sed 's/[^/]*$//g'`.
-. $basedir/common.sh
-
-mount
-enter_mydir
-
-mkdir foo
-echo foo > bar
-sync
-
-leave_mydir
-umount
diff --git a/qa/client/10_iozone.sh b/qa/client/10_iozone.sh
deleted file mode 100755
index 8389b2298c76..000000000000
--- a/qa/client/10_iozone.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-basedir=`echo $0 | sed 's/[^/]*$//g'`.
-. $basedir/common.sh
-
-mount
-enter_mydir
-
-iozone -c -e -s 1024M -r 16K -t 1 -F f1 -i 0 -i 1
-iozone -c -e -s 1024M -r 1M -t 1 -F f2 -i 0 -i 1
-iozone -c -e -s 10240M -r 1M -t 1 -F f3 -i 0 -i 1
-
-leave_mydir
-umount
diff --git a/qa/client/11_kernel_untar_build.sh b/qa/client/11_kernel_untar_build.sh
deleted file mode 100755
index ae7fded23cf2..000000000000
--- a/qa/client/11_kernel_untar_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-basedir=`echo $0 | sed 's/[^/]*$//g'`
-basedir="${basedir}."
-. $basedir/common.sh
-
-mount
-enter_mydir
-
-tar jxvf /root/linux*
-cd linux*
-make defconfig
-make
-cd ..
-rm -r linux*
-
-leave_mydir
-umount
diff --git a/qa/client/20_pjd.sh b/qa/client/20_pjd.sh
deleted file mode 100755
index 7752f3011b5e..000000000000
--- a/qa/client/20_pjd.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-basedir=`echo $0 | sed 's/[^/]*$//g'`.
-. $basedir/common.sh
-
-mount
-enter_mydir
-
-wget http://tuxera.com/sw/qa/pjd-fstest-20080816.tgz
-tar zxvf pjd*
-cd pjd*
-make
-cd ..
-mkdir tmp
-cd tmp
-prove -r ../pjd*/tests
-
-leave_mydir
-umount
diff --git a/qa/client/30_dbench.sh b/qa/client/30_dbench.sh
deleted file mode 100755
index d20ba0c04fd6..000000000000
--- a/qa/client/30_dbench.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-basedir=`echo $0 | sed 's/[^/]*$//g'`.
-. $basedir/common.sh
-
-mount
-enter_mydir
-
-dbench 1
-dbench 10
-
-leave_mydir
-umount
diff --git a/qa/runallonce.sh b/qa/runallonce.sh
new file mode 100755
index 000000000000..2d34faf1bf5c
--- /dev/null
+++ b/qa/runallonce.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -x
+
+#set -e
+
+basedir=`pwd`
+testdir="${basedir}/testspace"
+
+mkdir -p $testdir
+
+for test in `cd $basedir && find workunits/* | grep .sh`
+do
+  cd $testdir
+  echo "------ running test $test ------"
+  mkdir -p $test
+  pushd .
+  cd $test
+  ${basedir}/${test}
+  popd
+done
\ No newline at end of file
diff --git a/qa/workunits/1.sh b/qa/workunits/1.sh
new file mode 100755
index 000000000000..de5878b001dd
--- /dev/null
+++ b/qa/workunits/1.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mkdir foo
+echo foo > bar
+sync
\ No newline at end of file
diff --git a/qa/workunits/10_iozone.sh b/qa/workunits/10_iozone.sh
new file mode 100755
index 000000000000..311d07ed37bc
--- /dev/null
+++ b/qa/workunits/10_iozone.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+iozone -c -e -s 1024M -r 16K -t 1 -F f1 -i 0 -i 1
+iozone -c -e -s 1024M -r 1M -t 1 -F f2 -i 0 -i 1
+iozone -c -e -s 10240M -r 1M -t 1 -F f3 -i 0 -i 1
diff --git a/qa/workunits/11_kernel_untar_build.sh b/qa/workunits/11_kernel_untar_build.sh
new file mode 100755
index 000000000000..d51a51d3b48d
--- /dev/null
+++ b/qa/workunits/11_kernel_untar_build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+tar jxvf /root/linux*
+cd linux*
+make defconfig
+make
+cd ..
+rm -r linux*
diff --git a/qa/workunits/20_pjd.sh b/qa/workunits/20_pjd.sh
new file mode 100755
index 000000000000..1b9b28decfac
--- /dev/null
+++ b/qa/workunits/20_pjd.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+wget http://tuxera.com/sw/qa/pjd-fstest-20080816.tgz
+tar zxvf pjd*
+cd pjd*
+make
+cd ..
+mkdir tmp
+cd tmp
+prove -r ../pjd*/tests
diff --git a/qa/workunits/30_dbench.sh b/qa/workunits/30_dbench.sh
new file mode 100755
index 000000000000..07e04e053d40
--- /dev/null
+++ b/qa/workunits/30_dbench.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+dbench 1
+dbench 10