Browse Source

tests: Use a symlink for default LOGDIR between scripts

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>
Jouni Malinen 11 years ago
parent
commit
b72c300267
2 changed files with 10 additions and 7 deletions
  1. 6 6
      tests/hwsim/run-tests.py
  2. 4 1
      tests/hwsim/start.sh

+ 6 - 6
tests/hwsim/run-tests.py

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

+ 4 - 1
tests/hwsim/start.sh

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