equal
deleted
inserted
replaced
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.blacklist: |
|
675 filename = options.blacklist.get(test) |
|
676 if filename is not None: |
|
677 skipped.append((test, "blacklisted (%s)" % filename)) |
|
678 return None |
|
679 |
|
680 if options.retest and not os.path.exists(test + ".err"): |
|
681 ignores.append((test, "not retesting")) |
|
682 return None |
|
683 |
674 if options.keywords: |
684 if options.keywords: |
675 fp = open(test) |
685 fp = open(test) |
676 t = fp.read().lower() + test.lower() |
686 t = fp.read().lower() + test.lower() |
677 fp.close() |
687 fp.close() |
678 for k in options.keywords.lower().split(): |
688 for k in options.keywords.lower().split(): |
951 skips = [] |
961 skips = [] |
952 fails = [] |
962 fails = [] |
953 ignores = [] |
963 ignores = [] |
954 |
964 |
955 for test in tests: |
965 for test in tests: |
956 if options.blacklist: |
|
957 filename = options.blacklist.get(test) |
|
958 if filename is not None: |
|
959 skipped.append((test, "blacklisted (%s)" % filename)) |
|
960 continue |
|
961 |
|
962 if options.retest and not os.path.exists(test + ".err"): |
|
963 ignores.append((test, "not retesting")) |
|
964 continue |
|
965 |
|
966 ret = runone(options, test, skips, passes, fails, ignores) |
966 ret = runone(options, test, skips, passes, fails, ignores) |
967 if options.first and ret is not None and not ret: |
967 if options.first and ret is not None and not ret: |
968 break |
968 break |
969 |
969 |
970 if options.child: |
970 if options.child: |