Skip to content

Commit

Permalink
Adds control file vars to a variety of control files in client/tests.
Browse files Browse the repository at this point in the history
Risk: Low
Visibility: Adds control file vars to client/tests files.

Signed-off-by: John Admanski <[email protected]>
  • Loading branch information
jadmanski committed Jul 8, 2008
1 parent eee73fb commit 278180d
Show file tree
Hide file tree
Showing 11 changed files with 115 additions and 6 deletions.
12 changes: 12 additions & 0 deletions iozone/control
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
AUTHOR = "Ying Tao <[email protected]>"
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')
12 changes: 12 additions & 0 deletions isic/control
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
AUTHOR = "Michal Piotrowski <[email protected]>"
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')
7 changes: 6 additions & 1 deletion kernbench/control
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
AUTHOR = "[email protected] (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')
7 changes: 6 additions & 1 deletion kernbench/control.readprofile
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
AUTHOR = "[email protected] (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')
24 changes: 21 additions & 3 deletions kernelbuild/control
Original file line number Diff line number Diff line change
@@ -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 = '[email protected] (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')
12 changes: 12 additions & 0 deletions kvmtest/control
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
AUTHOR = '[email protected] (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')
11 changes: 11 additions & 0 deletions kvmtest/control.testdir
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
AUTHOR = '[email protected] (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/"

Expand Down
11 changes: 11 additions & 0 deletions kvmtest/control.with_modbuild
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
AUTHOR = '[email protected] (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
#
#
Expand Down
2 changes: 1 addition & 1 deletion kvmtest/kvmtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
12 changes: 12 additions & 0 deletions libhugetlbfs/control
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
AUTHOR = '[email protected] (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')
11 changes: 11 additions & 0 deletions linus_stress/control
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
AUTHOR = '[email protected] (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')

0 comments on commit 278180d

Please sign in to comment.