Changeset 430

Show
Ignore:
Timestamp:
Sat Feb 23 11:12:59 2008
Author:
naufraghi
Message:

Modified runtest, now all tests are executed (default) but the interactive one(s), thet are executed if -i option is provided

Files:

Legend:

Unmodified
Added
Removed
Modified

  • branches/python2.5/buildtests/runtests.py

    r401 r430  
    55 55             print e  
    56 56  
    57   def runtests(sources=None):  
      57 def runtests(tests=None):  
    57 57     info = "Executing PyInstaller tests in: %s" % os.getcwd()  
    58 58     print "*"*len(info)  
    …… 
    63 63     build_python.write(sys.executable)  
    64 64     build_python.close()  
    65       alltests = glob.glob('test*[0-9].py')  
    66       if not sources:  
    67           tests = alltests  
    68       else:  
    69           tests = []  
    70           for part in sources:  
    71               tests += [t for t in alltests if part in t and t not in tests]  
    72 65     tests.sort(key=lambda x: (len(x), x)) # test1 < test10  
    73 66     path = os.environ["PATH"]  
    …… 
    89 82  
    90 83 if __name__ == '__main__':  
    91       if len(sys.argv) == 1:  
    92           clean()  
    93           runtests()  
    94       if '--clean' in sys.argv:  
    95           clean()  
    96       if '--run' in sys.argv:  
    97           runtests(sys.argv[2:])  
      84     normal_tests = glob.glob('test*[0-9].py')  
      85     interactive_tests = glob.glob('test*[0-9]i.py')  
      86     args = sys.argv[1:]  
      87      
      88     if "-i" in args:  
      89         print "Running interactive tests"  
      90         tests = interactive_tests  
      91     else:  
      92         print "Running normal tests"  
      93         tests = normal_tests  
      94  
      95     clean()  
      96     runtests(tests)