From patchwork Wed Jan 9 12:34:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1022409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DILHqqqv"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind-be.20150623.gappssmtp.com header.i=@mind-be.20150623.gappssmtp.com header.b="vN9W0FRP"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ZT9q0HYjz9sBQ for ; Wed, 9 Jan 2019 23:35:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=F58/AgizJE1MmzDYk55e2d8PEqkH+8R6p3FozfZRYJY=; b=DILHqqqvNEFlE0 vj2t3cGIGoBLyr6urQlX3TLiRXk/tqn3dUNqAjU5z96Yegd/pt73tx6XtGKJWPAnpS4NO9uo5sBv2 lKg2fysu1kME5Yh4KPrvXCFAeqW3aw+dbSgoVOPFkL5gGDpzn5Ly3DXmPOoagldk57VyPTs7sm2pi ldqvmuj5HaqqBYgTSK0Owqv6zhDiEzEJNX9Aiqb6graIPdcoaljdN9vXKbQVc7uPgWXPcck57E3LJ REUYUN0AqOIIK8nMWdcLA7tWQ8TSHayV/vwffBQi4L6iH0nM33AM/soywS3RovKclGMr85eMJqqJc +W1fqAAZ0+mR/PQeLp+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghD4f-0006mY-N6; Wed, 09 Jan 2019 12:35:09 +0000 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghD4b-0005yf-So for hostap@lists.infradead.org; Wed, 09 Jan 2019 12:35:08 +0000 Received: by mail-ed1-x543.google.com with SMTP id h50so7166893ede.5 for ; Wed, 09 Jan 2019 04:35:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind-be.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2cdlAxOJKl2WfRZLBgHQVzY56kGLsueRzZak+eZRR/Q=; b=vN9W0FRP46V98ClIjg4T1EAGMpwIeNs0qq11fKUyvqIfQ16WXL9Zy6fAnTHPbpe62S rypKeWyPn4ivrBIyU8/3ciZxg8kvque79EelAKTQBcrs7Q7xRWV6atIq8+cPWmr1k8fl IqSxF7jk+SdkgHAk+VnG3dN1VEX0UkM6o4d5oM2BgG/q9xk5L1WgEo79+K6XmsWDVpe8 nrKdsGmLL9xvcOZot54/2V9wcngOsTvvtNctPsZyVY0ZEZt20HLea+5OlUDph3c9mjHc mt0pUHYb4kOcYHu1peoc7lP0C9QS/wA7Y4X/OZRjACDw2quKVQVXao2Ng8yPwqEypJxE qmUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2cdlAxOJKl2WfRZLBgHQVzY56kGLsueRzZak+eZRR/Q=; b=EmPSxxrv3zIbUy2xGNrd7w/zElUpN6ySWqLPefq9T6hK+jDDBqcgXXY1a4fb0KkvnD 3FaJZT6tqjxhXTIgd9OIGkXbHlhqtKWpzeFyVhYbQ2Xc/C7QGxm/YNYsv2GvYgkouul3 AbdzPrIq2G1OBlPJvzv1o+Mb9aoQNQ3TRtoM19DxIQy3Plmrcak0h8b2C0ZwKoQDk4jg dufq1DdvdjuxGqavjqfXT1S9GTDN6ZIoMgpNH5oWOmnKJ3V9mZ06ZthRhPE6/K4m6kKi +jO82aNypld44Dg9XdB9M9enbOmSX6dJHb8s7PCI/w4OLUjdU2OWQ3PKrv60VTbL5Si1 xNUg== X-Gm-Message-State: AJcUukelScCWGCXnJFudxfHr8Wt0bCsyi/EvRSHn/O7ADHqOTmMTLe8M T7FWAxlFFEkGt0CNAjlm7Yk2zaoI81f8Cw== X-Google-Smtp-Source: ALg8bN6MZoItzJNit1+zDohiBFjezKk2st9VrYfHONQyck5vY8BYge/dSvzTkii/RoycoKhp5Zux4g== X-Received: by 2002:a50:9665:: with SMTP id y92mr5647747eda.282.1547037303228; Wed, 09 Jan 2019 04:35:03 -0800 (PST) Received: from arnout-laptop.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id b9sm2594105ede.12.2019.01.09.04.35.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jan 2019 04:35:02 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: hostap@lists.infradead.org Subject: [PATCH] tests: start.sh: fix logs/current symlink creation Date: Wed, 9 Jan 2019 13:34:11 +0100 Message-Id: <20190109123411.27125-1-arnout@mind.be> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190109_043506_007542_3F8A3CFD X-CRM114-Status: GOOD ( 11.66 ) X-Spam-Score: 0.8 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Arnout Vandecappelle \(Essensium/Mind\)" Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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) --- tests/hwsim/start.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh index 77e9791ab..648a54d84 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