r4319 - /1.3/relax -- January 04, 2008 - 14:32

Author: bugman
Date: Fri Jan  4 14:32:41 2008
New Revision: 4319

URL: http://svn.gna.org/viewcvs/relax?rev=4319&view=rev
Log:
Added the command line option --system-tests to run solely the relax 
system/functional tests.


Modified:
    1.3/relax

Modified: 1.3/relax
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax?rev=4319&r1=4318&r2=4319&view=diff
==============================================================================
--- 1.3/relax (original)
+++ 1.3/relax Fri Jan  4 14:32:41 2008
@@ -72,6 +72,7 @@
 from relax_io import log
 import relax_warnings
 from test_suite.runner import Test_suite_runner
+from test_suite.system_tests.main import System_tests
 from test_suite.unit_tests.unit_test_runner import Unit_test_runner
 from thread_classes import Threading, ThreadData
 import version
@@ -177,6 +178,15 @@
 
             # Run the tests.
             Test_suite_runner(self)
+
+        # Execute the relax system tests.
+        elif mode == 'system tests':
+            # Create a string to pass to the interpreter to print.
+            self.set_intro_string()
+
+            # Run the tests.
+            sys_runner = System_tests(self)
+            system_result = sys_runner.run()
 
         # Execute the relax unit tests.
         elif mode == 'unit test':
@@ -210,6 +220,7 @@
         parser.add_option('-p', '--pedantic', action='store_true', 
dest='pedantic', default=0, help='escalate all warnings to errors')
         parser.add_option('--test', action='store_true', dest='test', 
default=0, help='run relax in test mode')
         parser.add_option('--test-suite', action='store_true', 
dest='test_suite', default=0, help='execute the relax test suite')
+        parser.add_option('--system-tests', action='store_true', 
dest='system_tests', default=0, help='execute the relax system/functional 
tests (part of the test suite)')
         parser.add_option('--unit-test', action='store_true', 
dest='unit_test', default=0, help='execute the relax unit tests (part of the 
test suite)')
         parser.add_option('--thread', action='store_true', dest='thread', 
default=0, help='run relax in threading mode (this mode should not be invoked 
by a user)')
         parser.add_option('-v', '--version', action='store_true', 
dest='version', default=0, help='show the version number and exit')
@@ -269,7 +280,7 @@
             mode = 'version'
 
         # Run the relax tests.
-        elif options.test_suite or options.unit_test:
+        elif options.test_suite or options.system_tests or options.unit_test:
             # Make sure no script is supplied.
             if self.script_file:
                 parser.error("a script should not be supplied when executing 
the test suite")
@@ -285,6 +296,8 @@
             # Set the mode.
             if options.test_suite:
                 mode = 'test suite'
+            elif options.system_tests:
+                mode = 'system tests'
             elif options.unit_test:
                 mode = 'unit test'
 
@@ -296,7 +309,7 @@
                 parser.error("a script should not be supplied in test mode")
 
             # Exclusive modes.
-            if options.test_suite or options.unit_test:
+            if options.test_suite or options.system_tests or 
options.unit_test:
                 parser.error("the relax test mode and executing the test 
suite are mutually exclusive")
             elif options.thread:
                 parser.error("the relax modes test and thread are mutually 
exclusive")
@@ -328,7 +341,7 @@
                 parser.error("a script should not be supplied in test mode")
 
             # Exclusive modes.
-            if options.test_suite or options.unit_test:
+            if options.test_suite or options.system_tests or 
options.unit_test:
                 parser.error("the relax licence mode and executing the test 
suite are mutually exclusive")
             elif options.test:
                 parser.error("the relax modes licence and test are mutually 
exclusive")