equal
deleted
inserted
replaced
17 import signal |
17 import signal |
18 import sys |
18 import sys |
19 import tempfile |
19 import tempfile |
20 import time |
20 import time |
21 |
21 |
22 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] |
22 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed", "merge"] |
23 |
23 |
24 parser = optparse.OptionParser("%prog [options] [tests]") |
24 parser = optparse.OptionParser("%prog [options] [tests]") |
25 parser.add_option("-v", "--verbose", action="store_true", |
25 parser.add_option("-v", "--verbose", action="store_true", |
26 help="output verbose messages") |
26 help="output verbose messages") |
27 parser.add_option("-t", "--timeout", type="int", |
27 parser.add_option("-t", "--timeout", type="int", |