tests/run-tests.py
changeset 19245 dcb05a1470bd
parent 19244 eee43d763f9f
child 19246 29ddf9d93e35
equal deleted inserted replaced
19244:eee43d763f9f 19245:dcb05a1470bd
   830     True -> passed
   830     True -> passed
   831     False -> failed'''
   831     False -> failed'''
   832 
   832 
   833     global results, resultslock, iolock
   833     global results, resultslock, iolock
   834 
   834 
   835     testpath = os.path.join(TESTDIR, test)
       
   836 
       
   837     def result(l, e):
   835     def result(l, e):
   838         resultslock.acquire()
   836         resultslock.acquire()
   839         results[l].append(e)
   837         results[l].append(e)
   840         resultslock.release()
   838         resultslock.release()
   841 
   839 
   877     def describe(ret):
   875     def describe(ret):
   878         if ret < 0:
   876         if ret < 0:
   879             return 'killed by signal %d' % -ret
   877             return 'killed by signal %d' % -ret
   880         return 'returned error code %d' % ret
   878         return 'returned error code %d' % ret
   881 
   879 
       
   880     testpath = os.path.join(TESTDIR, test)
       
   881     err = os.path.join(TESTDIR, test + ".err")
       
   882     lctest = test.lower()
       
   883 
   882     if not os.path.exists(test):
   884     if not os.path.exists(test):
   883             skip("doesn't exist")
   885             skip("doesn't exist")
   884             return None
   886             return None
   885 
   887 
   886     if not (options.whitelisted and test in options.whitelisted):
   888     if not (options.whitelisted and test in options.whitelisted):
   905 
   907 
   906     vlog("# Test", test)
   908     vlog("# Test", test)
   907 
   909 
   908     createhgrc(HGRCPATH, options)
   910     createhgrc(HGRCPATH, options)
   909 
   911 
   910     err = os.path.join(TESTDIR, test+".err")
       
   911     if os.path.exists(err):
   912     if os.path.exists(err):
   912         os.remove(err)       # Remove any previous output files
   913         os.remove(err)       # Remove any previous output files
   913     lctest = test.lower()
       
   914 
   914 
   915     for ext, func, out in testtypes:
   915     for ext, func, out in testtypes:
   916         if lctest.startswith("test-") and lctest.endswith(ext):
   916         if lctest.startswith("test-") and lctest.endswith(ext):
   917             runner = func
   917             runner = func
   918             ref = os.path.join(TESTDIR, test + out)
   918             ref = os.path.join(TESTDIR, test + out)