]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: prepare for a hierarchical test script system
authorGreg Farnum <gregf@hq.newdream.net>
Fri, 13 Nov 2009 00:44:35 +0000 (16:44 -0800)
committerGreg Farnum <gregf@hq.newdream.net>
Fri, 13 Nov 2009 00:44:35 +0000 (16:44 -0800)
qa/client/1.sh [deleted file]
qa/client/10_iozone.sh [deleted file]
qa/client/11_kernel_untar_build.sh [deleted file]
qa/client/20_pjd.sh [deleted file]
qa/client/30_dbench.sh [deleted file]
qa/runallonce.sh [new file with mode: 0755]
qa/workunits/1.sh [new file with mode: 0755]
qa/workunits/10_iozone.sh [new file with mode: 0755]
qa/workunits/11_kernel_untar_build.sh [new file with mode: 0755]
qa/workunits/20_pjd.sh [new file with mode: 0755]
qa/workunits/30_dbench.sh [new file with mode: 0755]

diff --git a/qa/client/1.sh b/qa/client/1.sh
deleted file mode 100755 (executable)
index 89eed2e..0000000
+++ /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 (executable)
index 8389b22..0000000
+++ /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 (executable)
index ae7fded..0000000
+++ /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 (executable)
index 7752f30..0000000
+++ /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 (executable)
index d20ba0c..0000000
+++ /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 (executable)
index 0000000..2d34faf
--- /dev/null
@@ -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 (executable)
index 0000000..de5878b
--- /dev/null
@@ -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 (executable)
index 0000000..311d07e
--- /dev/null
@@ -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 (executable)
index 0000000..d51a51d
--- /dev/null
@@ -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 (executable)
index 0000000..1b9b28d
--- /dev/null
@@ -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 (executable)
index 0000000..07e04e0
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/bash
+dbench 1
+dbench 10