tests: run workunits/cephtool/test.sh

Three scripts are added to run qa/workunits/cephtool/test.sh for each
daemon (mon, mds, osd) so they can be run in parallel.

http://tracker.ceph.com/issues/9815 Fixes: #9815

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 1631f1e1225f73c87c21c31a30d208e8f6c37cbf..a7bc9d97bb5183820c70148e65428cab8ec654f2 100644 (file)
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -232,6 +232,9 @@ bin_DEBUGPROGRAMS += ceph_bench_log
 ## Unit tests
 
 check_SCRIPTS += \
+       test/cephtool-test-osd.sh \
+       test/cephtool-test-mon.sh \
+       test/cephtool-test-mds.sh \
        unittest_bufferlist.sh \
        test/encoding/check-generated.sh \
        test/mon/osd-pool-create.sh \
@@ -242,8 +245,7 @@ check_SCRIPTS += \
        test/osd/osd-config.sh \
        test/osd/osd-bench.sh \
        test/ceph-disk.sh \
-       test/mon/mon-handle-forward.sh \
-       test/vstart_wrapped_tests.sh
+       test/mon/mon-handle-forward.sh
 
 EXTRA_DIST += \
        $(srcdir)/test/mon/mon-test-helpers.sh \

diff --git a/src/test/cephtool-test-mds.sh b/src/test/cephtool-test-mds.sh
new file mode 100755 (executable)
index 0000000..f3ecd96
--- /dev/null
+++ b/src/test/cephtool-test-mds.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
+#
+# Author: Loic Dachary <loic@dachary.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library Public License as published by
+# the Free Software Foundation; either version 2, 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 Library Public License for more details.
+#
+MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 test/vstart_wrapper.sh \
+    ../qa/workunits/cephtool/test.sh \
+    --test-mds \
+    --asok-does-not-need-root

diff --git a/src/test/cephtool-test-mon.sh b/src/test/cephtool-test-mon.sh
new file mode 100755 (executable)
index 0000000..09ac99b
--- /dev/null
+++ b/src/test/cephtool-test-mon.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
+#
+# Author: Loic Dachary <loic@dachary.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library Public License as published by
+# the Free Software Foundation; either version 2, 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 Library Public License for more details.
+#
+MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 test/vstart_wrapper.sh \
+    ../qa/workunits/cephtool/test.sh \
+    --test-mon \
+    --asok-does-not-need-root

diff --git a/src/test/cephtool-test-osd.sh b/src/test/cephtool-test-osd.sh
new file mode 100755 (executable)
index 0000000..dbbe644
--- /dev/null
+++ b/src/test/cephtool-test-osd.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
+#
+# Author: Loic Dachary <loic@dachary.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library Public License as published by
+# the Free Software Foundation; either version 2, 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 Library Public License for more details.
+#
+MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 test/vstart_wrapper.sh \
+    ../qa/workunits/cephtool/test.sh \
+    --test-osd \
+    --asok-does-not-need-root