comparison tests/run-tests.py @ 13991:8cfe191e2ce4

run-tests: move keyword checking into runone
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Apr 2011 11:24:27 -0500
parents ddf488bfbdbd
children ec4ae5727f07
comparison
equal deleted inserted replaced
13990:ddf488bfbdbd 13991:8cfe191e2ce4
669 skip("doesn't exist") 669 skip("doesn't exist")
670 return None 670 return None
671 else: 671 else:
672 return None # not a supported test, don't record 672 return None # not a supported test, don't record
673 673
674 if options.keywords:
675 fp = open(test)
676 t = fp.read().lower() + test.lower()
677 fp.close()
678 for k in options.keywords.lower().split():
679 if k in t:
680 break
681 else:
682 ignores.append((test, "doesn't match keyword"))
683 return None
684
674 vlog("# Test", test) 685 vlog("# Test", test)
675 686
676 # create a fresh hgrc 687 # create a fresh hgrc
677 hgrc = open(HGRCPATH, 'w+') 688 hgrc = open(HGRCPATH, 'w+')
678 hgrc.write('[ui]\n') 689 hgrc.write('[ui]\n')
952 963
953 if options.retest and not os.path.exists(test + ".err"): 964 if options.retest and not os.path.exists(test + ".err"):
954 ignores.append((test, "not retesting")) 965 ignores.append((test, "not retesting"))
955 continue 966 continue
956 967
957 if options.keywords:
958 try:
959 fp = open(test)
960 except IOError:
961 continue
962 t = fp.read().lower() + test.lower()
963 fp.close()
964 for k in options.keywords.lower().split():
965 if k in t:
966 break
967 else:
968 ignores.append((test, "doesn't match keyword"))
969 continue
970
971 ret = runone(options, test, skips, fails, ignores) 968 ret = runone(options, test, skips, fails, ignores)
972 if ret is None: 969 if ret is None:
973 skipped += 1 970 skipped += 1
974 elif not ret: 971 elif not ret:
975 failed += 1 972 failed += 1