aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2013-03-08 11:46:38 -0800
committerJordan Justen <jordan.l.justen@intel.com>2013-03-10 15:20:27 -0700
commitee9b0a8d27d9ef5025336559c6dee4e387074af3 (patch)
tree48775a2693609ac1941f05715f82fb6cbdd6c49f
parent160ae02604243908898ab21085cf0b49c189e6f3 (diff)
downloadpiglit-ee9b0a8d27d9ef5025336559c6dee4e387074af3.tar.gz
Change --tests to --include-tests
Excluding tests already uses a similar syntax (--exclude-tests), so this is more consistent. V2: - Leaves --tests option, but marks it as deprecated Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
-rwxr-xr-xpiglit-print-commands.py12
-rwxr-xr-xpiglit-run.py12
2 files changed, 20 insertions, 4 deletions
diff --git a/piglit-print-commands.py b/piglit-print-commands.py
index 7a3ba147..0d27b77d 100755
--- a/piglit-print-commands.py
+++ b/piglit-print-commands.py
@@ -48,8 +48,10 @@ Prints a list of all the tests and how to run them. Ex:
Options:
-h, --help Show this message
- -t regexp, --tests=regexp Run only matching tests (can be used more
+ -t regexp, --include-tests=regexp Run only matching tests (can be used more
than once)
+ --tests=regexp Run only matching tests (can be used more
+ than once) DEPRICATED use --include-tests instead
-x regexp, --exclude-tests=regexp Exclude matching tests (can be used
more than once)
Example:
@@ -71,6 +73,7 @@ def main():
option_list = [
"help",
"tests=",
+ "include-tests=",
"exclude-tests=",
]
options, args = getopt(sys.argv[1:], "ht:x:", option_list)
@@ -85,9 +88,14 @@ def main():
for name, value in options:
if name in ('-h', '--help'):
usage()
- elif name in ('-t', '--tests'):
+ elif name in ('-t', '--include-tests'):
test_filter.append(value)
env.filter.append(re.compile(value))
+ elif name in ('--tests'):
+ test_filter.append(value)
+ env.filter.append(re.compile(value))
+ print "Warning: Option --tets is deprecated, " \
+ "use --include-tests instead"
elif name in ('-x', '--exclude-tests'):
exclude_filter.append(value)
env.exclude_filter.append(re.compile(value))
diff --git a/piglit-run.py b/piglit-run.py
index 8da99a0e..9d319eb2 100755
--- a/piglit-run.py
+++ b/piglit-run.py
@@ -45,8 +45,10 @@ Usage: %(progName)s [options] [profile.tests] [results]
Options:
-h, --help Show this message
-d, --dry-run Do not execute the tests
- -t regexp, --tests=regexp Run only matching tests (can be used more
+ -t regexp, --include-tests=regexp Run only matching tests (can be used more
than once)
+ --tests=regexp Run only matching tests (can be used more
+ than once) DEPRICATED: use --include-tests instead
-x regexp, --exclude-tests=regexp Excludey matching tests (can be used
more than once)
-n name, --name=name Name of the testrun
@@ -81,6 +83,7 @@ def main():
"dry-run",
"resume",
"valgrind",
+ "include-tests=",
"tests=",
"name=",
"exclude-tests=",
@@ -106,9 +109,14 @@ def main():
OptionResume = True
elif name in ('--valgrind'):
env.valgrind = True
- elif name in ('-t', '--tests'):
+ elif name in ('-t', '--include-tests'):
test_filter.append(value)
env.filter.append(re.compile(value))
+ elif name in ('--tests'):
+ test_filter.append(value)
+ env.filter.append(re.compile(value))
+ print "Warning: Option --tests is deprecated, " \
+ "use --include-tests instead"
elif name in ('-x', '--exclude-tests'):
exclude_filter.append(value)
env.exclude_filter.append(re.compile(value))