From patchwork Tue May 3 06:00:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 748892 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4362A1G006260 for ; Tue, 3 May 2011 06:02:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751778Ab1ECGCH (ORCPT ); Tue, 3 May 2011 02:02:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32070 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751694Ab1ECGCG (ORCPT ); Tue, 3 May 2011 02:02:06 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p43625VU028191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 3 May 2011 02:02:06 -0400 Received: from freedom.redhat.com (vpn-8-194.rdu.redhat.com [10.11.8.194]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4360pZR012374; Tue, 3 May 2011 02:02:04 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 2/2] KVM test: Update ctcs run on guests Date: Tue, 3 May 2011 03:00:53 -0300 Message-Id: <1304402453-5107-3-git-send-email-lmr@redhat.com> In-Reply-To: <1304402453-5107-1-git-send-email-lmr@redhat.com> References: <1304402453-5107-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 03 May 2011 06:02:10 +0000 (UTC) Just update the config file and the control file that is supposed to run on guests. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/autotest_control/cerberus.control | 20 -------------------- client/tests/kvm/autotest_control/ctcs.control | 19 +++++++++++++++++++ client/tests/kvm/tests_base.cfg.sample | 4 ++-- 3 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 client/tests/kvm/autotest_control/cerberus.control create mode 100644 client/tests/kvm/autotest_control/ctcs.control diff --git a/client/tests/kvm/autotest_control/cerberus.control b/client/tests/kvm/autotest_control/cerberus.control deleted file mode 100644 index 5a828f0..0000000 --- a/client/tests/kvm/autotest_control/cerberus.control +++ /dev/null @@ -1,20 +0,0 @@ -AUTHOR = """ -Manas Kumar Nayak (maknayak@in.ibm.com) (original code) -Lucas Meneghel Rodrigues (lucasmr@br.ibm.com) (rewrite) -Cao, Chen (use ctcs2 and port it to 64) -""" -NAME = "Cerberus test suite" -TEST_TYPE = "CLIENT" -TEST_CLASS = "HARDWARE" -TEST_CATEGORY = "BENCHMARK" -TIME = "MEDIUM" -DOC = """\ -Executes the cerberus test for a period of time specified. You -can also provide a cerberus test control file of your own, trough the parameter -tcf_contents. - -see http://sourceforge.net/projects/ctcs2 - and http://sourceforge.net/projects/va-ctcs -""" - -job.run_test(url='cerberus', length='1h', tc_opt='-k -C -a') diff --git a/client/tests/kvm/autotest_control/ctcs.control b/client/tests/kvm/autotest_control/ctcs.control new file mode 100644 index 0000000..c105344 --- /dev/null +++ b/client/tests/kvm/autotest_control/ctcs.control @@ -0,0 +1,19 @@ +AUTHOR = """ +Manas Kumar Nayak (maknayak@in.ibm.com) (original code) +Lucas Meneghel Rodrigues (lucasmr@br.ibm.com) (rewrite) +Cao, Chen (use ctcs2 and port it to 64) +Lucas Meneghel Rodrigues (lmr@redhat.com) (use ctcs new source repo) +""" +NAME = "CTCS" +TEST_TYPE = "CLIENT" +TEST_CLASS = "HARDWARE" +TEST_CATEGORY = "BENCHMARK" +TIME = "MEDIUM" +DOC = """ +Executes CTCS for a period of time specified. You can also provide a cerberus +test control file of your own, trough the parameter tcf_contents. + +see https://github.com/autotest/ctcs +""" + +job.run_test(url='ctcs', length='1h', tc_opt='-k -C -a') diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index d3597b4..3b69b37 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -233,11 +233,11 @@ variants: test_control_file = stress.control - disktest: test_control_file = disktest.control - - ctcs2: + - ctcs: # If you think this is too lengthy, please change the cerberus # control file and set this timeout appropriately. test_timeout = 3900 - test_control_file = cerberus.control + test_control_file = ctcs.control - npb: test_control_file = npb.control - hackbench: