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

tests: Use a symlink for default LOGDIR between scripts

Browse source 
This allows run-tests.py to use the same logs/<date> default logdir as
start.sh which is quite convenient for manual test runs.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-10-31 14:27:57 +02:00 committed by Jouni Malinen
parent 353e5067ff
commit b72c300267
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/hwsim/run-tests.py
View file

@ -92,7 +92,7 @@ def main():
print_res = False print_res = False
parser = argparse.ArgumentParser(description='hwsim test runner') parser = argparse.ArgumentParser(description='hwsim test runner')
parser.add_argument('--logdir', metavar='<directory>', default='logs', parser.add_argument('--logdir', metavar='<directory>',
help='log output directory for all other options, ' + help='log output directory for all other options, ' +
'must be given if other log options are used') 'must be given if other log options are used')
group = parser.add_mutually_exclusive_group() group = parser.add_mutually_exclusive_group()
@ -135,11 +135,11 @@ def main():
print 'Invalid arguments - both test module and tests given' print 'Invalid arguments - both test module and tests given'
sys.exit(2) sys.exit(2)
if (args.logfile or args.errorfile or
args.resultsfile or args.tracing):
if not args.logdir: if not args.logdir:
print 'Need --logdir for the given options' if os.path.exists('logs/current'):
sys.exit(2) args.logdir = 'logs/current'
else:
args.logdir = 'logs'
if args.logfile: if args.logfile:
logger.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)

5
tests/hwsim/start.sh
View file

@ -8,8 +8,11 @@ WLANTEST=$DIR/../../wlantest/wlantest
HLR_AUC_GW=$DIR/../../hostapd/hlr_auc_gw HLR_AUC_GW=$DIR/../../hostapd/hlr_auc_gw
if [ -z "$LOGDIR" ] ; then if [ -z "$LOGDIR" ] ; then
LOGDIR="$DIR/logs/$(date +%s)" DATE="$(date +%s)"
LOGDIR="$DIR/logs/$DATE"
mkdir -p $LOGDIR mkdir -p $LOGDIR
rm -rf $DIR/logs/current
ln -sf $DATE $DIR/logs/current
fi fi
if groups | tr ' ' "\n" | grep -q ^admin$; then if groups | tr ' ' "\n" | grep -q ^admin$; then