From 3bfa5f10a9e2adc62755832f89aa2ba34e25e54c Mon Sep 17 00:00:00 2001 From: Ilan Peer Date: Sun, 26 Oct 2014 03:06:33 -0400 Subject: [PATCH] tests: Add support for reading modules list from a file The new run-tests.py argument "-l " can now be used to specify the test modules using a text file. Signed-off-by: Ilan Peer --- tests/hwsim/run-tests.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py index 52cb7f9da..7352a1ce8 100755 --- a/tests/hwsim/run-tests.py +++ b/tests/hwsim/run-tests.py @@ -195,14 +195,16 @@ def main(): parser.add_argument('-f', dest='testmodules', metavar='', help='execute only tests from these test modules', type=str, choices=[[]] + test_modules, nargs='+') + parser.add_argument('-l', metavar='', dest='mfile', + help='test modules file name') parser.add_argument('tests', metavar='', nargs='*', type=str, help='tests to run (only valid without -f)', choices=[[]] + test_names) args = parser.parse_args() - if args.tests and args.testmodules: - print 'Invalid arguments - both test module and tests given' + if (args.tests and args.testmodules) or (args.tests and args.mfile) or (args.testmodules and args.mfile): + print 'Invalid arguments - only one of (test, test modules, modules file) can be given.' sys.exit(2) if not args.logdir: @@ -290,6 +292,16 @@ def main(): if args.dmesg: subprocess.call(['sudo', 'dmesg', '-c'], stdout=open('/dev/null', 'w')) + # read the modules from the modules file + if args.mfile: + args.testmodules = [] + with open(args.mfile) as f: + for line in f.readlines(): + line = line.strip() + if not line or line.startswith('#'): + continue + args.testmodules.append(line) + tests_to_run = [] for t in tests: name = t.__name__.replace('test_', '', 1)