X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fautotest_runner.py;h=260b72ca8839241160c6bd72a9409d8919e5e61e;hb=503f9e8b42562b923e73e908be6ba69964f1f1e7;hp=af225ffebb2cd164f7153b4abbd6fbb4fec793cd;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py index af225ffebb..260b72ca88 100644 --- a/app/test/autotest_runner.py +++ b/app/test/autotest_runner.py @@ -1,14 +1,14 @@ #!/usr/bin/python # BSD LICENSE -# -# Copyright(c) 2010-2013 Intel Corporation. All rights reserved. +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -18,7 +18,7 @@ # * Neither the name of Intel Corporation nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -208,23 +208,19 @@ class AutotestRunner: def __get_cmdline(self, test): cmdline = self.cmdline - # perform additional linuxapp adjustments - if not "baremetal" in self.target: - - # append memory limitations for each test - # otherwise tests won't run in parallel - if not "i686" in self.target: - cmdline += " --socket-mem=%s"% test["Memory"] - else: - # affinitize startup so that tests don't fail on i686 - cmdline = "taskset 1 " + cmdline - cmdline += " -m " + str(sum(map(int,test["Memory"].split(",")))) + # append memory limitations for each test + # otherwise tests won't run in parallel + if not "i686" in self.target: + cmdline += " --socket-mem=%s"% test["Memory"] + else: + # affinitize startup so that tests don't fail on i686 + cmdline = "taskset 1 " + cmdline + cmdline += " -m " + str(sum(map(int,test["Memory"].split(",")))) - # set group prefix for autotest group - # otherwise they won't run in parallel - cmdline += " --file-prefix=%s"% test["Prefix"] + # set group prefix for autotest group + # otherwise they won't run in parallel + cmdline += " --file-prefix=%s"% test["Prefix"] - return cmdline return cmdline @@ -338,12 +334,7 @@ class AutotestRunner: self.__filter_groups(self.non_parallel_test_groups) # create a pool of worker threads - if not "baremetal" in self.target: - pool = multiprocessing.Pool(processes=1) - else: - # we can't be sure running baremetal tests in parallel - # will work, so let's stay on the safe side - pool = multiprocessing.Pool(processes=1) + pool = multiprocessing.Pool(processes=1) results = []