From patchwork Fri Apr 15 16:22:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 65941 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp22377qge; Fri, 15 Apr 2016 09:22:34 -0700 (PDT) X-Received: by 10.50.20.130 with SMTP id n2mr5681741ige.82.1460737354836; Fri, 15 Apr 2016 09:22:34 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 7si1468053igl.21.2016.04.15.09.22.34; Fri, 15 Apr 2016 09:22:34 -0700 (PDT) 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 495E36736D; Fri, 15 Apr 2016 16:22:34 +0000 (UTC) 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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 87754669CB; Fri, 15 Apr 2016 16:22:29 +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 9CAC2669D7; Fri, 15 Apr 2016 16:22:27 +0000 (UTC) Received: from mail-qg0-f54.google.com (mail-qg0-f54.google.com [209.85.192.54]) by lists.linaro.org (Postfix) with ESMTPS id D0956667B1 for ; Fri, 15 Apr 2016 16:22:24 +0000 (UTC) Received: by mail-qg0-f54.google.com with SMTP id j35so83905137qge.0 for ; Fri, 15 Apr 2016 09:22:24 -0700 (PDT) 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=b7ywftzEVrwHw0IX5CkSD9caLaXcvB5PbVQYZK5yhcY=; b=VWCvvvrFeKHkxgYme9LIpgCxVteR9+18hzsSoSrgvuTp3L4ZPH5qx17m5MIoLgSon+ bzf0MK9j9Kd5mBw4LUei28eMLC9ngniBDUhJ/CcU0+s0Ej/d5n/11gCOP52sjGaW71F+ x8vZLjXQNkwyLspxaNpJCWlHadvEcWq3T2zPwn4GMy97CwXKIaVKzMYFqhhk5bJMxhLs C/RHpk/iJhPd/z/S589l55BweWpQ/rFDXftbyVORgwkJ3hm26Kqdwu2y3O4Gru+LcrFf 6Sw9iq2K/JBUory4ZG2lROr22gJjQkjW8ge+hQmE0sq0JQPX0ii1KVreDgC1iqc1qiKG mnFQ== X-Gm-Message-State: AOPr4FWAyRwGGzCQr/0GfvwypTCWwKT7TFyM/1voe6YzzL7RgjCbBBn0oMEUWTHaPpPAE37zSpc= X-Received: by 10.140.155.7 with SMTP id b7mr27728395qhb.14.1460737344596; Fri, 15 Apr 2016 09:22:24 -0700 (PDT) Received: from localhost.localdomain (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by smtp.gmail.com with ESMTPSA id l67sm20669982qgl.47.2016.04.15.09.22.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Apr 2016 09:22:24 -0700 (PDT) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Fri, 15 Apr 2016 12:22:04 -0400 Message-Id: <1460737324-8720-1-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.5.0 X-Topics: patch Subject: [lng-odp] [PATCH] configure: Fix broken conditional example execution 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 configure environment was incorrect and the examples always run with make check Signed-off-by: Mike Holmes --- configure.ac | 2 ++ example/m4/configure.m4 | 2 +- example/switch/Makefile.am | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9665d1d..9acc203 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,7 @@ AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ]) +AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) @@ -243,5 +244,6 @@ AC_MSG_RESULT([ test_perf: ${test_perf} test_cpp: ${test_cpp} test_helper: ${test_helper} + test_example: ${test_example} user_guides: ${user_guides} ]) diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index 229fed5..11f9fdf 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -3,7 +3,7 @@ ########################################################################## test_example=no AC_ARG_ENABLE([test-example], - [ --enable-test-example run basic test aginast examples], + [ --enable-test-example run basic test aginast examples], [if test "x$enableval" = "xyes"; then test_example=yes else diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am index e18c681..20ca3cd 100644 --- a/example/switch/Makefile.am +++ b/example/switch/Makefile.am @@ -9,7 +9,9 @@ noinst_HEADERS = \ dist_odp_switch_SOURCES = odp_switch.c -if HAVE_PCAP -TESTS = switch_run.sh +if test_example + if HAVE_PCAP + TESTS = switch_run.sh + endif endif EXTRA_DIST = switch_run.sh udp64.pcap