From 278180d63ee9f0bfee2e12c13125778761b62201 Mon Sep 17 00:00:00 2001 From: John Admanski Date: Tue, 8 Jul 2008 22:14:29 +0000 Subject: [PATCH] Adds control file vars to a variety of control files in client/tests. Risk: Low Visibility: Adds control file vars to client/tests files. Signed-off-by: John Admanski --- iozone/control | 12 ++++++++++++ isic/control | 12 ++++++++++++ kernbench/control | 7 ++++++- kernbench/control.readprofile | 7 ++++++- kernelbuild/control | 24 +++++++++++++++++++++--- kvmtest/control | 12 ++++++++++++ kvmtest/control.testdir | 11 +++++++++++ kvmtest/control.with_modbuild | 11 +++++++++++ kvmtest/kvmtest.py | 2 +- libhugetlbfs/control | 12 ++++++++++++ linus_stress/control | 11 +++++++++++ 11 files changed, 115 insertions(+), 6 deletions(-) diff --git a/iozone/control b/iozone/control index 5ecddbb47..ff40eb63c 100644 --- a/iozone/control +++ b/iozone/control @@ -1 +1,13 @@ +AUTHOR = "Ying Tao " +TIME = "MEDIUM" +NAME = "IOzone" +TEST_TYPE = "client" +TEST_CLASS = "Kernel" +TEST_CATEGORY = "Benchmark" + +DOC = """ +Runs the standard IOzone filesystem benchmark. For more information see +http://www.iozone.org +""" + job.run_test('iozone') diff --git a/isic/control b/isic/control index f110f4efa..7ab5e3832 100644 --- a/isic/control +++ b/isic/control @@ -1 +1,13 @@ +AUTHOR = "Michal Piotrowski " +TIME = "MEDIUM" +NAME = "ISIC" +TEST_TYPE = "client" +TEST_CLASS = "Kernel" +TEST_CATEGORY = "Functional" + +DOC = """ +Runs the ISIC (IP Stack Integrity Checker) test. For more information see +http://www.packetfactory.net/Projects/ISIC/ +""" + job.run_test('isic') diff --git a/kernbench/control b/kernbench/control index 21a55d091..9fc5da761 100755 --- a/kernbench/control +++ b/kernbench/control @@ -1,7 +1,12 @@ +AUTHOR = "mbligh@google.com (Martin Bligh)" NAME = "Kernbench" TIME = "SHORT" TEST_CLASS = "Kernel" -TEST_CATEGORY = "Functional" +TEST_CATEGORY = "Benchmark" TEST_TYPE = "client" +DOC = """ +A standard CPU benchmark. Runs a kernel compile and measures the performance. +""" + job.run_test('kernbench') diff --git a/kernbench/control.readprofile b/kernbench/control.readprofile index 8e5dc368a..dd9a3f49e 100755 --- a/kernbench/control.readprofile +++ b/kernbench/control.readprofile @@ -1,9 +1,14 @@ +AUTHOR = "mbligh@google.com (Martin Bligh)" NAME = "Kernbench readprofile" TIME = "Medium" TEST_CLASS = "Kernel" -TEST_CATEGORY = "Functional" +TEST_CATEGORY = "Benchmark" TEST_TYPE = "client" +DOC = """ +Run kernbench using the readprofile profiler. +""" + job.profilers.add('readprofile') job.run_test('kernbench', 0, 5) job.profilers.delete('readprofile') diff --git a/kernelbuild/control b/kernelbuild/control index 64e03d802..64a196228 100755 --- a/kernelbuild/control +++ b/kernelbuild/control @@ -1,4 +1,22 @@ -job.run_test('kernelbuild', '/usr/local/src/linux-2.6.14.tar.bz2', ['/usr/local/src/patch-2.6.14-git6.bz2'], 'http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/config.up', tag='2.6.14-git6') -job.run_test('kernelbuild', '/usr/local/src/linux-2.6.18.tar.bz2', ['http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2', 'http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.19-rc6-git2.bz2'], 'http://mbligh.org/config/opteron2', tag='2.6.19-rc6-git2') -job.run_test('kernelbuild', '/usr/local/src/linux-2.6.18.tar.bz2', [], 'http://mbligh.org/config/opteron2', tag='2.6.18') +AUTHOR = 'mbligh@google.com (Martin Bligh)' +TIME = 'SHORT' +NAME = 'Kernel Build' +TEST_TYPE = 'client' +TEST_CLASS = 'Kernel' +TEST_CATEGORY = 'Functional' +DOC = ''' +Builds several Linux kernels from source. Unlike kernbench, this test does +not attempt to measure the compilation. +''' + +job.run_test('kernelbuild', '/usr/local/src/linux-2.6.14.tar.bz2', + ['/usr/local/src/patch-2.6.14-git6.bz2'], + 'http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/config.up', + tag='2.6.14-git6') +job.run_test('kernelbuild', '/usr/local/src/linux-2.6.18.tar.bz2', + ['http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2', + 'http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.19-rc6-git2.bz2'], + 'http://mbligh.org/config/opteron2', tag='2.6.19-rc6-git2') +job.run_test('kernelbuild', '/usr/local/src/linux-2.6.18.tar.bz2', [], + 'http://mbligh.org/config/opteron2', tag='2.6.18') diff --git a/kvmtest/control b/kvmtest/control index bf5ec50d1..dadc44d50 100644 --- a/kvmtest/control +++ b/kvmtest/control @@ -1 +1,13 @@ +AUTHOR = 'ryanh@us.ibm.com (Ryan Harper)' +TIME = 'SHORT' +NAME = 'KVM Test' +TEST_TYPE = 'client' +TEST_CLASS = 'Kernel' +TEST_CATEGORY = 'Functional' + +DOC = ''' +kvm-test is a package for automating guest installation. For more information +see http://kvm.qumranet.com/kvmwiki/KVMTest +''' + job.run_test('kvmtest') diff --git a/kvmtest/control.testdir b/kvmtest/control.testdir index 7d14adc4a..41017801e 100644 --- a/kvmtest/control.testdir +++ b/kvmtest/control.testdir @@ -1,3 +1,14 @@ +AUTHOR = 'ryanh@us.ibm.com (Ryan Harper)' +TIME = 'SHORT' +NAME = 'KVM Test with custom testdir' +TEST_TYPE = 'client' +TEST_CLASS = 'Kernel' +TEST_CATEGORY = 'Functional' + +DOC = ''' +Run kvm-test, but using a custom kvm-test test dir (/opt/kvmtest_tests). +''' + # CHANGEME - point to your kvm-test test dirs TESTDIR="/opt/kvmtest_tests/" diff --git a/kvmtest/control.with_modbuild b/kvmtest/control.with_modbuild index a527c682d..bb4bbaedc 100644 --- a/kvmtest/control.with_modbuild +++ b/kvmtest/control.with_modbuild @@ -1,3 +1,14 @@ +AUTHOR = 'ryanh@us.ibm.com (Ryan Harper)' +TIME = 'SHORT' +NAME = 'KVM Test with KVM module build' +TEST_TYPE = 'client' +TEST_CLASS = 'Kernel' +TEST_CATEGORY = 'Functional' + +DOC = ''' +Run kvm-test after first downloading, building and installing the KVM module. +''' + # CHANGEME - point to kvm release tarball # # diff --git a/kvmtest/kvmtest.py b/kvmtest/kvmtest.py index 655d503cd..b738e3a84 100644 --- a/kvmtest/kvmtest.py +++ b/kvmtest/kvmtest.py @@ -81,7 +81,7 @@ def __create_vncserver(self, dirname): in the environment, then attempt to spawn a vncserver, and change env DISPLAY so that kvmtest can run """ - for pidfile in locate("*:*.pid", dirname): + for pidfile in autotest_utils.locate("*:*.pid", dirname): pid = open(pidfile, 'r').readline().strip() # if the server is still active, just use it for display if os.path.exists('/proc/%s/status' % pid): diff --git a/libhugetlbfs/control b/libhugetlbfs/control index f33fdbfd1..4703e088d 100644 --- a/libhugetlbfs/control +++ b/libhugetlbfs/control @@ -1 +1,13 @@ +AUTHOR = 'aganti@google.com (Ashwin Ganti)' +TIME = 'MEDIUM' +NAME = 'libhugetlbfs test' +TEST_TYPE = 'client' +TEST_CLASS = 'Kernel' +TEST_CATEGORY = 'Functional' + +DOC = ''' +Tests basic huge pages functionality when using libhugetlbfs. For more info +about libhugetlbfs see http://libhugetlbfs.ozlabs.org/ +''' + job.run_test('libhugetlbfs', '/mnt') diff --git a/linus_stress/control b/linus_stress/control index 8e5b1660a..3f9d22d2c 100644 --- a/linus_stress/control +++ b/linus_stress/control @@ -1 +1,12 @@ +AUTHOR = 'mbligh@google.com (Martin Bligh)' +TIME = 'MEDIUM' +NAME = 'Linus Stress' +TEST_TYPE = 'client' +TEST_CLASS = 'Kernel' +TEST_CATEGORY = 'Stress' + +DOC = ''' +Runs the standard linus_stress test. +''' + job.run_test('linus_stress')