jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Honor HWSIM_TEST_LOG_DIR variable in VM runs

Browse source 
If /tmp has a relatively small size limit, or multiple people run the
tests on the same machine, using the same output directory can easily
cause problems.

Make the test framework honor the new HWSIM_TEST_LOG_DIR environment
variable to make it easier to avoid those problems.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-11-24 17:39:58 +01:00 committed by Jouni Malinen
parent 10a15590f8
commit 680ce356c0
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/hwsim/vm/parallel-vm.py
View file

@ -352,6 +352,13 @@ def main():
help="run tests under valgrind") help="run tests under valgrind")
p.add_argument('params', nargs='*') p.add_argument('params', nargs='*')
args = p.parse_args() args = p.parse_args()
dir = os.environ.get('HWSIM_TEST_LOG_DIR', '/tmp/hwsim-test-logs')
try:
os.makedirs(dir)
except:
pass
num_servers = args.num_servers num_servers = args.num_servers
rerun_failures = not args.no_retry rerun_failures = not args.no_retry
if args.debug: if args.debug:
@ -363,7 +370,7 @@ def main():
extra_args += [ '--long' ] extra_args += [ '--long' ]
if args.codecov: if args.codecov:
print "Code coverage - build separate binaries" print "Code coverage - build separate binaries"
logdir = "/tmp/hwsim-test-logs/" + str(timestamp) logdir = os.path.join(dir, str(timestamp))
os.makedirs(logdir) os.makedirs(logdir)
subprocess.check_call([os.path.join(scriptsdir, 'build-codecov.sh'), subprocess.check_call([os.path.join(scriptsdir, 'build-codecov.sh'),
logdir]) logdir])
@ -390,12 +397,6 @@ def main():
if len(tests) == 0: if len(tests) == 0:
sys.exit("No test cases selected") sys.exit("No test cases selected")
dir = '/tmp/hwsim-test-logs'
try:
os.mkdir(dir)
except:
pass
if args.shuffle: if args.shuffle:
from random import shuffle from random import shuffle
shuffle(tests) shuffle(tests)

6
tests/hwsim/vm/parallel-vm.sh
View file

@ -9,7 +9,11 @@ if [ -z "$NUM" ]; then
fi fi
shift shift
LOGS=/tmp/hwsim-test-logs if [ -n "$HWSIM_TEST_LOG_DIR" ] ; then
LOGS="$HWSIM_TEST_LOG_DIR"
else
LOGS=/tmp/hwsim-test-logs
fi
mkdir -p $LOGS mkdir -p $LOGS
DATE=$(date +%s) DATE=$(date +%s)

6
tests/hwsim/vm/vm-run.sh
View file

@ -6,7 +6,11 @@ if [ -z "$TESTDIR" ] ; then
TESTDIR=$(pwd)/../ TESTDIR=$(pwd)/../
fi fi
LOGS=/tmp/hwsim-test-logs if [ -n "$HWSIM_TEST_LOG_DIR" ] ; then
LOGS="$HWSIM_TEST_LOG_DIR"
else
LOGS=/tmp/hwsim-test-logs
fi
# increase the memory size if you want to run with valgrind, 512 MB works # increase the memory size if you want to run with valgrind, 512 MB works
MEMORY=192 MEMORY=192