X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fautotest.py;h=5c19a022d1d8223ec223fa170d0a5ae4fde2bc0d;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=f7056a39294cfc2fe8aeb38f5ae59905c8a688b0;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git diff --git a/app/test/autotest.py b/app/test/autotest.py index f7056a3929..5c19a022d1 100644 --- a/app/test/autotest.py +++ b/app/test/autotest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # BSD LICENSE # @@ -32,51 +32,48 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Script that uses either test app or qemu controlled by python-pexpect - -import sys, autotest_data, autotest_runner - +from __future__ import print_function +import autotest_data +import autotest_runner +import sys def usage(): - print"Usage: autotest.py [test app|test iso image]", - print "[target] [whitelist|-blacklist]" + print("Usage: autotest.py [test app|test iso image] ", + "[target] [whitelist|-blacklist]") if len(sys.argv) < 3: - usage() - sys.exit(1) + usage() + sys.exit(1) target = sys.argv[2] -test_whitelist=None -test_blacklist=None +test_whitelist = None +test_blacklist = None # get blacklist/whitelist if len(sys.argv) > 3: - testlist = sys.argv[3].split(',') - testlist = [test.lower() for test in testlist] - if testlist[0].startswith('-'): - testlist[0] = testlist[0].lstrip('-') - test_blacklist = testlist - else: - test_whitelist = testlist + testlist = sys.argv[3].split(',') + testlist = [test.lower() for test in testlist] + if testlist[0].startswith('-'): + testlist[0] = testlist[0].lstrip('-') + test_blacklist = testlist + else: + test_whitelist = testlist -# adjust test command line -if "baremetal" in target: - cmdline = "qemu-system-x86_64 -cdrom %s.iso -boot d " % (sys.argv[1]) - cmdline += "-m 2000 -smp 4 -nographic -net nic,model=e1000" - platform = "QEMU x86_64" -else: - cmdline = "%s -c f -n 4"%(sys.argv[1]) +cmdline = "%s -c f -n 4" % (sys.argv[1]) -print cmdline +print(cmdline) -runner = autotest_runner.AutotestRunner(cmdline, target, test_blacklist, test_whitelist) +runner = autotest_runner.AutotestRunner(cmdline, target, test_blacklist, + test_whitelist) for test_group in autotest_data.parallel_test_group_list: - runner.add_parallel_test_group(test_group) + runner.add_parallel_test_group(test_group) for test_group in autotest_data.non_parallel_test_group_list: - runner.add_non_parallel_test_group(test_group) + runner.add_non_parallel_test_group(test_group) -runner.run_all_tests() +num_fails = runner.run_all_tests() +sys.exit(num_fails)