Show More
@@ -919,7 +919,11 b' def runchildren(options, tests):' | |||||
919 |
|
919 | |||
920 | optcopy = dict(options.__dict__) |
|
920 | optcopy = dict(options.__dict__) | |
921 | optcopy['jobs'] = 1 |
|
921 | optcopy['jobs'] = 1 | |
|
922 | ||||
|
923 | blacklist = optcopy['blacklist'] or [] | |||
922 | del optcopy['blacklist'] |
|
924 | del optcopy['blacklist'] | |
|
925 | blacklisted = [] | |||
|
926 | ||||
923 | if optcopy['with_hg'] is None: |
|
927 | if optcopy['with_hg'] is None: | |
924 | optcopy['with_hg'] = os.path.join(BINDIR, "hg") |
|
928 | optcopy['with_hg'] = os.path.join(BINDIR, "hg") | |
925 | optcopy.pop('anycoverage', None) |
|
929 | optcopy.pop('anycoverage', None) | |
@@ -941,7 +945,11 b' def runchildren(options, tests):' | |||||
941 | for job in jobs: |
|
945 | for job in jobs: | |
942 | if not tests: |
|
946 | if not tests: | |
943 | break |
|
947 | break | |
944 |
|
|
948 | test = tests.pop() | |
|
949 | if test in blacklist: | |||
|
950 | blacklisted.append(test) | |||
|
951 | else: | |||
|
952 | job.append(test) | |||
945 | fps = {} |
|
953 | fps = {} | |
946 |
|
954 | |||
947 | for j, job in enumerate(jobs): |
|
955 | for j, job in enumerate(jobs): | |
@@ -979,9 +987,12 b' def runchildren(options, tests):' | |||||
979 | vlog('pid %d exited, status %d' % (pid, status)) |
|
987 | vlog('pid %d exited, status %d' % (pid, status)) | |
980 | failures |= status |
|
988 | failures |= status | |
981 |
|
989 | |||
|
990 | skipped += len(blacklisted) | |||
982 | if not options.noskips: |
|
991 | if not options.noskips: | |
983 | for s in skips: |
|
992 | for s in skips: | |
984 | print "Skipped %s: %s" % (s[0], s[1]) |
|
993 | print "Skipped %s: %s" % (s[0], s[1]) | |
|
994 | for s in blacklisted: | |||
|
995 | print "Skipped %s: blacklisted" % s | |||
985 | for s in fails: |
|
996 | for s in fails: | |
986 | print "Failed %s: %s" % (s[0], s[1]) |
|
997 | print "Failed %s: %s" % (s[0], s[1]) | |
987 |
|
998 |
General Comments 0
You need to be logged in to leave comments.
Login now