r26012 - in /branches/frame_order_cleanup: ./ relax.py test_suite/relax_test_loader.py test_suite/test_suite_runner.py -- September 24, 2014 - 14:52

Author: bugman
Date: Wed Sep 24 14:52:45 2014
New Revision: 26012

URL: http://svn.gna.org/viewcvs/relax?rev=26012&view=rev
Log:
Merged revisions 26011 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r26011 | bugman | 2014-09-24 14:51:22 +0200 (Wed, 24 Sep 2014) | 7 lines
  
  Created the new --no-skip relax command line option.
  
  This is a debugging option specifically designed for relax developers.  It 
allows all blacklisted
  tests to be executed, i.e. all blacklists are ignored.  These tests would 
normally be skipped,
  however this option enables them.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/relax.py
    branches/frame_order_cleanup/test_suite/relax_test_loader.py
    branches/frame_order_cleanup/test_suite/test_suite_runner.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 24 14:52:45 2014
@@ -1 +1 @@
-/trunk:1-25985
+/trunk:1-26011

Modified: branches/frame_order_cleanup/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/relax.py?rev=26012&r1=26011&r2=26012&view=diff
==============================================================================
--- branches/frame_order_cleanup/relax.py       (original)
+++ branches/frame_order_cleanup/relax.py       Wed Sep 24 14:52:45 2014
@@ -317,6 +317,7 @@
         group.add_option('--gui-tests', action='store_true', 
dest='gui_tests', default=0, help='execute the GUI tests')
         group.add_option('--verification-tests', action='store_true', 
dest='verification_tests', default=0, help='execute the software verification 
tests')
         group.add_option('--time', action='store_true', dest='tt', 
default=0, help='enable the timing of individual tests in the test suite')
+        group.add_option('--no-skip', action='store_true', dest='no_skip', 
default=0, help='a debugging option for relax developers to turn on all 
blacklisted tests, even those that will fail')
         parser.add_option_group(group)
 
         # Recognised command line options for debugging.
@@ -388,6 +389,11 @@
             if options.tt:
                 self.test_timings = True
 
+            # Run blacklisted tests.
+            status.skip_blacklisted_tests = True
+            if options.no_skip:
+                status.skip_blacklisted_tests = False
+
         # The argument is a script.
         else:
             # Number of positional arguments should only be 0 or 1.  1 
should be the script file.

Modified: branches/frame_order_cleanup/test_suite/relax_test_loader.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/relax_test_loader.py?rev=26012&r1=26011&r2=26012&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/relax_test_loader.py        
(original)
+++ branches/frame_order_cleanup/test_suite/relax_test_loader.py        Wed 
Sep 24 14:52:45 2014
@@ -56,7 +56,7 @@
             test_case = testCaseClass(testCaseNames[i])
 
             # Skip.
-            if status.skipped_tests and testCaseNames[i] in 
list(zip(*status.skipped_tests))[0]:
+            if status.skip_blacklisted_tests and status.skipped_tests and 
testCaseNames[i] in list(zip(*status.skipped_tests))[0]:
                 continue
 
             # Append the test case.

Modified: branches/frame_order_cleanup/test_suite/test_suite_runner.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/test_suite_runner.py?rev=26012&r1=26011&r2=26012&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/test_suite_runner.py        
(original)
+++ branches/frame_order_cleanup/test_suite/test_suite_runner.py        Wed 
Sep 24 14:52:45 2014
@@ -283,7 +283,8 @@
         title(file=sys.stdout, text="Summary of the relax test suite")
 
         # The skipped tests.
-        self.summary_skipped()
+        if status.skip_blacklisted_tests:
+            self.summary_skipped()
 
         # Subtitle.
         section(file=sys.stdout, text="Synopsis")