=== modified file 'doc/tests.rst'
--- doc/tests.rst	2012-03-16 11:23:01 +0000
+++ doc/tests.rst	2012-03-22 13:45:31 +0000
@@ -31,8 +31,8 @@
  * `wifi-enablement`_
 
 bluetooth-enablement
-+++++++++
-.. automodule:: lava_test.test_definitions.bluetooth-enablement
+++++++++++++++++++++
+.. automodule:: lava_test.test_definitions.bluetooth_enablement
 
 bootchart
 +++++++++
@@ -67,21 +67,25 @@
 .. automodule:: lava_test.test_definitions.insanity
 
 leb-basic-graphics
-+++++++++
-.. automodule:: lava_test.test_definitions.leb-basic-graphics
+++++++++++++++++++
+.. automodule:: lava_test.test_definitions.leb_basic_graphics
 
 ltp
 +++
 .. automodule:: lava_test.test_definitions.ltp
 
 lttng
-+++
++++++
 .. automodule:: lava_test.test_definitions.lttng
 
 peacekeeper
 +++++++++++
 .. automodule:: lava_test.test_definitions.peacekeeper
 
+perf
+++++
+.. automodule:: lava_test.test_definitions.perf
+
 posixtestsuite
 ++++++++++++++
 .. automodule:: lava_test.test_definitions.posixtestsuite
@@ -115,6 +119,6 @@
 .. automodule:: lava_test.test_definitions.xrestop
 
 wifi-enablement
-+++++++++
-.. automodule:: lava_test.test_definitions.wifi-enablement
++++++++++++++++
+.. automodule:: lava_test.test_definitions.wifi_enablement
 

=== modified file 'lava_test/core/providers.py'
--- lava_test/core/providers.py	2012-03-16 15:01:57 +0000
+++ lava_test/core/providers.py	2012-03-22 13:45:31 +0000
@@ -27,7 +27,7 @@
     """
 
     _builtin_tests = [
-        'bluetooth-enablement',
+        'bluetooth_enablement',
         'bootchart',
         'insanity',
         'e2eaudiotest',
@@ -36,7 +36,7 @@
         'glmemperf',
         'gmpbench',
         'gtkperf',
-        'leb-basic-graphics',
+        'leb_basic_graphics',
         'ltp',
         'lttng',
         'peacekeeper',
@@ -49,7 +49,7 @@
         'tiobench',
         'x11perf',
         'xrestop',
-        'wifi-enablement',
+        'wifi_enablement',
     ]
 
     def __init__(self, config):

=== renamed file 'lava_test/test_definitions/bluetooth-enablement.py' => 'lava_test/test_definitions/bluetooth_enablement.py'
=== renamed file 'lava_test/test_definitions/leb-basic-graphics.py' => 'lava_test/test_definitions/leb_basic_graphics.py'
=== modified file 'lava_test/test_definitions/perf.py'
--- lava_test/test_definitions/perf.py	2012-03-08 19:22:26 +0000
+++ lava_test/test_definitions/perf.py	2012-03-17 11:02:42 +0000
@@ -13,6 +13,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+"""
+A simple test for the perf performance counters subsystem in Linux.  This 
+currently just runs 'perf test' sanity tests built into the perf tool
+
+**URL:** None
+
+**Default options:** None
+"""
+
 from lava_test.core.installers import TestInstaller
 from lava_test.core.parsers import TestParser
 from lava_test.core.runners import TestRunner

=== modified file 'lava_test/test_definitions/posixtestsuite.py'
--- lava_test/test_definitions/posixtestsuite.py	2012-03-08 19:22:27 +0000
+++ lava_test/test_definitions/posixtestsuite.py	2012-03-17 11:02:42 +0000
@@ -14,14 +14,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-   This script automates the automate installation, execution, and
-   results parsing for the OpenPosix test suite.
-   The POSIX Test Suite is an open source test suite with the goal of
-   performing conformance, functional, and stress testing of the IEEE
-   1003.1-2001 System Interfaces specification However the automation here
-   does not support the stress test runs.
-
+The POSIX Test Suite is an open source test suite with the goal of
+performing conformance, functional, and stress testing of the IEEE
+1003.1-2001 System Interfaces specification However the automation here
+does not support the stress test runs.
+
+**URL:** http://sourceforge.net/projects/posixtest/
+
+**Default options:** None
 """
+
 import re
 
 from lava_test.core.installers import TestInstaller

=== modified file 'lava_test/test_definitions/pwrmgmt.py'
--- lava_test/test_definitions/pwrmgmt.py	2012-03-08 19:22:29 +0000
+++ lava_test/test_definitions/pwrmgmt.py	2012-03-17 11:02:42 +0000
@@ -13,6 +13,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+"""
+Linaro Power Management QA test suite
+
+**URL:** http://git.linaro.org/gitweb?p=tools/pm-qa.git;a=summary
+
+**Default options:** None
+"""
+
+
 
 from lava_test.core.installers import TestInstaller
 from lava_test.core.parsers import TestParser

=== modified file 'lava_test/test_definitions/pybench.py'
--- lava_test/test_definitions/pybench.py	2012-03-08 19:22:30 +0000
+++ lava_test/test_definitions/pybench.py	2012-03-17 11:02:42 +0000
@@ -14,10 +14,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-   This script automates the automate installation, execution, and
-   results parsing for the Pybench test suite.
-   The Pybench test Suite is an open source test suite that provides a
-   standardized way to measure the performance of Python implementations.
+The Pybench test Suite is an open source test suite that provides a
+standardized way to measure the performance of Python implementations.
+
+**URL:** http://python.org
+
+**Default options:** None
 """
 
 

=== modified file 'lava_test/test_definitions/render-bench.py'
--- lava_test/test_definitions/render-bench.py	2010-10-01 13:09:45 +0000
+++ lava_test/test_definitions/render-bench.py	2012-03-17 11:02:42 +0000
@@ -1,3 +1,29 @@
+# Copyright (c) 2012 Linaro
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+A program that performs a series of tests to benchmark the XRender X11
+extension.  It also performs the same tests using the Imlib2 library to
+provide a base for comparing performance.
+
+**URL:** None
+
+**Default options:** None
+"""
+
+
 import re
 import abrek.testdef
 

=== modified file 'lava_test/test_definitions/smem.py'
--- lava_test/test_definitions/smem.py	2012-03-08 19:22:32 +0000
+++ lava_test/test_definitions/smem.py	2012-03-17 11:02:42 +0000
@@ -13,6 +13,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+"""
+Simple test for smem that simply reports the memory usage with shared memory divided proportionally
+
+**URL:** None
+
+**Default options:** None
+"""
+
+
 from lava_test.core.installers import TestInstaller
 from lava_test.core.parsers import TestParser
 from lava_test.core.runners import TestRunner

=== modified file 'lava_test/test_definitions/stream.py'
--- lava_test/test_definitions/stream.py	2012-03-08 19:22:33 +0000
+++ lava_test/test_definitions/stream.py	2012-03-17 11:02:42 +0000
@@ -13,6 +13,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+"""
+The Stream benchmark for measuring memory bandwidth
+
+**URL:** http://www.cs.virginia.edu/stream/
+
+**Default options:** None
+"""
+
+
 from lava_test.core.installers import TestInstaller
 from lava_test.core.parsers import TestParser
 from lava_test.core.runners import TestRunner

=== modified file 'lava_test/test_definitions/tiobench.py'
--- lava_test/test_definitions/tiobench.py	2012-03-08 19:22:35 +0000
+++ lava_test/test_definitions/tiobench.py	2012-03-17 11:02:42 +0000
@@ -13,12 +13,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-"""
-   This script automates the installation, execution, and
-   results parsing for the tiobench test suite.
-   tiobench is a multi-threaded I/O benchmark. It is used to measure
-   file system performance in four basic operations: sequential read,
-   random read, sequential write, and random write.
+
+"""
+Tiobench is a multi-threaded I/O benchmark. It is used to measure
+system performance in four basic operations: sequential read,
+random read, sequential write, and random write.
+
+**URL:** http://sourceforge.net/projects/tiobench/
+
+**Default options:** --block=4096 --block=8192 --threads=2 --numruns=2
+"""
+
+"""
 """
 import re
 

=== renamed file 'lava_test/test_definitions/wifi-enablement.py' => 'lava_test/test_definitions/wifi_enablement.py'
=== modified file 'lava_test/test_definitions/x11perf.py'
--- lava_test/test_definitions/x11perf.py	2012-03-08 19:22:38 +0000
+++ lava_test/test_definitions/x11perf.py	2012-03-17 11:02:42 +0000
@@ -14,6 +14,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+"""
+X11perf is an xlib based benchmark to see how fast an X server can execute various tests
+
+**URL:** http://cgit.freedesktop.org/xorg/app/x11perf/
+
+**Default options:** -repeat 3 -aa10text -aa24text -aatrapezoid300 -aatrap2x300 -copypixwin500 -copypixpix500 -comppixwin500 -shmput500 -shmputxy500 -scroll500
+"""
+
+
 
 from lava_test.core.installers import TestInstaller
 from lava_test.core.parsers import TestParser

=== modified file 'lava_test/test_definitions/xrestop.py'
--- lava_test/test_definitions/xrestop.py	2012-03-08 19:22:40 +0000
+++ lava_test/test_definitions/xrestop.py	2012-03-17 11:02:42 +0000
@@ -15,10 +15,10 @@
 
 """
 xrestop - test for X11 server resource usage monitor
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Default options:
- None
+
+**URL:** None
+
+**Default options:** None
 """
 
 from lava_test.core.installers import TestInstaller

