tests/run-tests.py
branchstable
changeset 823 ab2ba4e79bed
parent 822 842e2c76e64b
child 824 6d3f8caef3b3
equal deleted inserted replaced
822:842e2c76e64b 823:ab2ba4e79bed
   497         os.close(fd)
   497         os.close(fd)
   498 
   498 
   499         cmd = '/bin/sh "%s"' % name
   499         cmd = '/bin/sh "%s"' % name
   500         vlog("# Running", cmd)
   500         vlog("# Running", cmd)
   501         exitcode, output = run(cmd, options)
   501         exitcode, output = run(cmd, options)
       
   502         # do not merge output if skipped, return hghave message instead
       
   503         if exitcode == SKIPPED_STATUS:
       
   504             return exitcode, output
   502     finally:
   505     finally:
   503         os.remove(name)
   506         os.remove(name)
   504 
   507 
   505     def rematch(el, l):
   508     def rematch(el, l):
   506         try:
   509         try: