From patchwork Wed Jan 13 13:52:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 59666 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3375854lbb; Wed, 13 Jan 2016 05:52:21 -0800 (PST) X-Received: by 10.140.22.210 with SMTP id 76mr124899402qgn.70.1452693141704; Wed, 13 Jan 2016 05:52:21 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j91si1420317qgf.73.2016.01.13.05.52.21; Wed, 13 Jan 2016 05:52:21 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1B0726177B; Wed, 13 Jan 2016 13:52:21 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=RohZtVK+; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6A5E261766; Wed, 13 Jan 2016 13:52:17 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6DC0E6176F; Wed, 13 Jan 2016 13:52:14 +0000 (UTC) Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) by lists.linaro.org (Postfix) with ESMTPS id AEA466044B for ; Wed, 13 Jan 2016 13:52:13 +0000 (UTC) Received: by mail-qg0-f42.google.com with SMTP id b35so324279408qge.0 for ; Wed, 13 Jan 2016 05:52:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=kwaYHg7S6pK60AGMBPsat88g0Hhk1GSLzr/O5sITE5g=; b=RohZtVK+rqpUaIuT2vi5HNsf5e5SrV3wrzinw7noILPw/57V16K2jj8r26InWO/W4Z s9576aCZZLICzKqM1odVAq3p46iY/p5KMjsDzhaAD8WWtubNdaMtmDDTAgLu88re5APz Iktn+aYbkMByHUeD5rrxDnn3bDKLfs/JBMdSg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kwaYHg7S6pK60AGMBPsat88g0Hhk1GSLzr/O5sITE5g=; b=B8/rg4XBp0RhhTmXvNlyP8U5GsJuQxiOnhcR4+GgBN1JBy/Esz2bbE5n5zMZ5elO3g NN6DDIYawkNbHa3R7pUWaDQ0N/WS08V5VkGVIVE/bhQ23HyAEjvDZn8CwQwdJXmz661r oNTmiQr63ftIUeZmg4G2BrXZJPYk+STb+5+WKxW5ma5FsMu8pUycYtOUNtwDbFwCE2Yr QJUQGJ3qbGbqYn7Sf8X1m1TDxInEoss3XtXWrfAAY1JP/TotsRhACqJBRheWW0FZRYoS bA0O+VXrcfPxKJJv2ybG3j8oyXNmrPYxk3NdphitXdtoCUEm0/y+tqUd5I/65X+92fh0 ovgQ== X-Gm-Message-State: ALoCoQk+yj8CfTQN6MnjRe9czCKGyZlrmext3fN2PvJjYJW4n8Bfv+ePnmJ8ukJoQ8i+kTUX8oojUtE6OU7XuhXOaEt5LTkm7A== X-Received: by 10.140.170.212 with SMTP id q203mr54979621qhq.32.1452693133057; Wed, 13 Jan 2016 05:52:13 -0800 (PST) Received: from localhost.localdomain (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id c7sm505732qkb.38.2016.01.13.05.52.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jan 2016 05:52:12 -0800 (PST) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Wed, 13 Jan 2016 08:52:07 -0500 Message-Id: <1452693127-28492-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 X-Topics: patch Subject: [lng-odp] [PATCH v2] test: perf: l2fwd detect missing odp_generator X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" The script did not check that the odp_generator was present. Updates to ensure the clean up is always called at EXIT Signed-off-by: Mike Holmes Reviewed-by: Stuart Haslam --- v2: Use stuarts suggetion to clean up the interfaces on EXIT test/performance/odp_l2fwd_run | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run index 001d8c2..cab97a8 100755 --- a/test/performance/odp_l2fwd_run +++ b/test/performance/odp_l2fwd_run @@ -48,12 +48,20 @@ fi run_l2fwd() { - setup_pktio_env + setup_pktio_env clean # install trap to call cleanup_pktio_env + if [ $? -ne 0 ]; then echo "setup_pktio_env error $?" exit $TEST_SKIPPED fi + type odp_generator > /dev/null + if [ $? -ne 0 ]; then + echo "odp_generator not installed. Aborting." + cleanup_pktio_env + exit 1 + fi + #@todo: limit odp_generator to cores #https://bugs.linaro.org/show_bug.cgi?id=1398 (odp_generator${EXEEXT} -I $IF0 \ @@ -88,9 +96,6 @@ run_l2fwd() rm -f $LOG cleanup_pktio_env - if [ $? -ne 0 ]; then - echo "cleanup_pktio_env error $?" - fi exit $ret }