From: Loic Dachary Date: Sat, 18 Oct 2014 22:43:51 +0000 (-0700) Subject: tests: run workunits/cephtool/test.sh X-Git-Tag: v0.89~46^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0cb12c71b9978761e4ec171858662dd132ff5473;p=ceph.git 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 --- diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 1631f1e1225..a7bc9d97bb5 100644 --- 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 index 00000000000..f3ecd9634ae --- /dev/null +++ b/src/test/cephtool-test-mds.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +# Copyright (C) 2013 Cloudwatt +# +# Author: Loic Dachary +# +# 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 index 00000000000..09ac99ba197 --- /dev/null +++ b/src/test/cephtool-test-mon.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +# Copyright (C) 2013 Cloudwatt +# +# Author: Loic Dachary +# +# 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 index 00000000000..dbbe6441f00 --- /dev/null +++ b/src/test/cephtool-test-osd.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# +# Copyright (C) 2013 Cloudwatt +# +# Author: Loic Dachary +# +# 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