aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-01-09 12:34:11 (GMT)
committerJouni Malinen <j@w1.fi>2019-01-12 15:39:59 (GMT)
commit222ff97bc3107b2a2a08631453a261e047b7ddcb (patch)
treefad063f13046908d4cf7427fa5e6a79494663e1c
parentcbf25808b9cc8678e1bb8a7ce1f359f3be8db296 (diff)
downloadhostap-222ff97bc3107b2a2a08631453a261e047b7ddcb.zip
hostap-222ff97bc3107b2a2a08631453a261e047b7ddcb.tar.gz
hostap-222ff97bc3107b2a2a08631453a261e047b7ddcb.tar.bz2
tests: start.sh: fix logs/current symlink creation
Since 3bdc651a624, start.sh creates the logs/current symlink even if LOGDIR was set in the environment, as is the case when using run-all.sh. However, run-all.sh and start.sh use a separate 'date' invocation so the resulting string may be different. Usually it is the same because the two invocations immediately follow each other, *except* if run-all.sh also does a build. In addition, if the user sets LOGDIR to something else, the symlink is completely bogus. Fix this by not relying on the 'date' invocation for creating the symlink. Instead, use the basename of LOGDIR. To keep things consistent with current behavior, only create the symlink if LOGDIR points to a subdirectory of DIR/logs. The following use cases now work reliably: * run-all.sh with or without the -B option; * manually calling start.sh followed by run-tests.py without setting LOGDIR. * manually calling start.sh with LOGDIR set to a subdirectory of logs and calling run-tests.py without --logdir option (which makes it default to logs/current). * run-all.sh with LOGDIR set to a subdirectory of logs. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rwxr-xr-xtests/hwsim/start.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index 77e9791..648a54d 100755
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -8,9 +8,9 @@ HAPD_AS=$DIR/../../hostapd/hostapd
HAPDCLI=$DIR/../../hostapd/hostapd_cli
WLANTEST=$DIR/../../wlantest/wlantest
HLR_AUC_GW=$DIR/../../hostapd/hlr_auc_gw
-DATE="$(date +%s)"
if [ -z "$LOGDIR" ] ; then
+ DATE="$(date +%s)"
LOGDIR="$DIR/logs/$DATE"
mkdir -p $LOGDIR
else
@@ -51,9 +51,10 @@ else
fi
fi
-if test -w "$DIR/logs" ; then
- rm -rf $DIR/logs/current
- ln -sf $DATE $DIR/logs/current
+LOGBASEDIR="$( cd "$(dirname "$LOGDIR")" && pwd )"
+if test "$LOGBASEDIR" = "$DIR/logs" -a -w "$LOGBASEDIR" ; then
+ rm -rf "$LOGBASEDIR/current"
+ ln -sf "$(basename "$LOGDIR")" "$LOGBASEDIR/current"
fi
if groups | tr ' ' "\n" | grep -q ^admin$; then