From 3bdc651a6247b991d33a4e32eb2597afc84c25a0 Mon Sep 17 00:00:00 2001 From: Eduardo Abinader Date: Thu, 27 Feb 2014 11:18:36 -0400 Subject: [PATCH] tests: Fix current log dir symbolic link Fix updating of the current symbolic link when LOGDIR is already set. The current symbolic link was only set, if LOGDIR has not been previously defined. If the user had chosen to cancel the running test iteration and run it again by running start.sh again, the current symbolic link was not updated. Signed-off-by: Eduardo Abinader --- tests/hwsim/start.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh index f5e8f27..95d1290 100755 --- a/tests/hwsim/start.sh +++ b/tests/hwsim/start.sh @@ -7,13 +7,11 @@ HAPD=$DIR/../../hostapd/hostapd HAPD_AS=$DIR/../../hostapd/hostapd 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 - rm -rf $DIR/logs/current - ln -sf $DATE $DIR/logs/current else if [ -e $LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant ]; then WPAS=$LOGDIR/alt-wpa_supplicant/wpa_supplicant/wpa_supplicant @@ -29,6 +27,11 @@ else fi fi +if test -w "$DIR/logs" ; then + rm -rf $DIR/logs/current + ln -sf $DATE $DIR/logs/current +fi + if groups | tr ' ' "\n" | grep -q ^admin$; then GROUP=admin else -- 2.1.4