From patchwork Fri Oct 3 15:17:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary.robertson@linaro.org X-Patchwork-Id: 38335 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E03392057C for ; Fri, 3 Oct 2014 15:19:09 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf825143lab.5 for ; Fri, 03 Oct 2014 08:19:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=+FrvZMevGQpbUE2cgdIoHlYETv/DsL/kqPQJZ256p64=; b=RMxDykzDBhFIoNrDIPgPNcNpTZWUKzEjzhWtk/nJO+A8nmGivcTn7PoXNRO/8PtYpV DFIlgcWMOCoXN0rQmFzT+244a1jUNKDMjcS5J69wHW57LgaU5AtGrW2W/pSAcejwU6QP a/QTptSG/0ciWc+3ygEuPv+QnmJynL43FwYrxlphVKhg2vVMW5AAtPiwGLtnggf6rQiT jXkHipKoND9E55FpXXWKDWEVSOBMoEuf0GLWNqtseZTu0lVrzSCPd4+90JGM/f5zjk+y xsLojWimaQDiEAp4M+7aKgFRpkL68zL/py3l2SljftSnGJJai8rS0JY2TSEB6LTPiquL YTcQ== X-Gm-Message-State: ALoCoQmBM4CglucHZXDq/myBYhRfvw6NsNaBwTHF0JDjgg2YFiXn73F8AeVqsW0i6mLMknd/daxb X-Received: by 10.112.156.167 with SMTP id wf7mr56559lbb.20.1412349547421; Fri, 03 Oct 2014 08:19:07 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.74 with SMTP id r10ls399411lag.109.gmail; Fri, 03 Oct 2014 08:19:07 -0700 (PDT) X-Received: by 10.152.206.101 with SMTP id ln5mr6726720lac.46.1412349547275; Fri, 03 Oct 2014 08:19:07 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id f8si11555085lbc.136.2014.10.03.08.19.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 Oct 2014 08:19:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id w7so1190180lbi.36 for ; Fri, 03 Oct 2014 08:19:06 -0700 (PDT) X-Received: by 10.112.50.10 with SMTP id y10mr5517684lbn.0.1412349546136; Fri, 03 Oct 2014 08:19:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp247362lbb; Fri, 3 Oct 2014 08:19:05 -0700 (PDT) X-Received: by 10.66.188.4 with SMTP id fw4mr583731pac.67.1412349539681; Fri, 03 Oct 2014 08:18:59 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id rg11si4767961pdb.142.2014.10.03.08.18.59 for ; Fri, 03 Oct 2014 08:18:59 -0700 (PDT) Received-SPF: none (google.com: openembedded-core-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 33D627177A; Fri, 3 Oct 2014 15:18:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f51.google.com (mail-oi0-f51.google.com [209.85.218.51]) by mail.openembedded.org (Postfix) with ESMTP id 07AD0708B3 for ; Fri, 3 Oct 2014 15:18:27 +0000 (UTC) Received: by mail-oi0-f51.google.com with SMTP id e131so905161oig.38 for ; Fri, 03 Oct 2014 08:18:26 -0700 (PDT) X-Received: by 10.182.107.234 with SMTP id hf10mr7858791obb.22.1412349506688; Fri, 03 Oct 2014 08:18:26 -0700 (PDT) Received: from honkintosh.cybertech.lan (65-120-133-114.dia.static.qwest.net. [65.120.133.114]) by mx.google.com with ESMTPSA id rw6sm4452660obb.28.2014.10.03.08.18.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 Oct 2014 08:18:25 -0700 (PDT) From: "Gary S. Robertson" To: openembedded-core@lists.openembedded.org Date: Fri, 3 Oct 2014 10:17:48 -0500 Message-Id: <1412349468-1146-3-git-send-email-gary.robertson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1412349468-1146-1-git-send-email-gary.robertson@linaro.org> References: <1412349468-1146-1-git-send-email-gary.robertson@linaro.org> Cc: mike.holmes@linaro.org Subject: [OE-core] [OE-CORE][PATCH 2/2] LTP - realtime tests - fix bad robust mutex conditionals X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: gary.robertson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Gary S. Robertson" The tests for robust mutexes contained conditional clauses which failed in autoconf and/or used nonexistent variable names. Modified these conditional clauses to use only the variables actually created by LTP autoconf for this purpose. Signed-off-by: Gary S. Robertson --- ...ltime-tests-Fix-robust-mutex-conditionals.patch | 62 ++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20140422.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch new file mode 100644 index 0000000..ccdd4d0 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch @@ -0,0 +1,62 @@ +From 663a14423baea0e05ba79d90d2497dde5e4594bd Mon Sep 17 00:00:00 2001 +From: "Gary S. Robertson" +Date: Thu, 11 Sep 2014 13:02:47 -0500 +Subject: [LTP][PATCH] Realtime tests: Fix robust mutex conditionals + +sbrk_mutex, testpi-5, and testpi-6 realtime tests in subdir +testcases/realtime/func/pi-tests used compile time config variables +which were not generated by autoconf in order to configure tests +for robust mutexes. Changed these conditionals to use the config +variables actually generated in the autoconf process. + +Upstream-Status: Submitted + +Signed-off-by: Gary S. Robertson +--- + testcases/realtime/func/pi-tests/sbrk_mutex.c | 2 +- + testcases/realtime/func/pi-tests/testpi-5.c | 2 +- + testcases/realtime/func/pi-tests/testpi-6.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/testcases/realtime/func/pi-tests/sbrk_mutex.c b/testcases/realtime/func/pi-tests/sbrk_mutex.c +index 684021f..5c325b4 100644 +--- a/testcases/realtime/func/pi-tests/sbrk_mutex.c ++++ b/testcases/realtime/func/pi-tests/sbrk_mutex.c +@@ -45,7 +45,7 @@ + #include + #include "librttest.h" + +-#if defined(HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS) && defined(PTHREAD_MUTEX_ROBUST_NP) ++#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS + + #define NUM_MUTEXES 5000 + #define NUM_THREADS 50 +diff --git a/testcases/realtime/func/pi-tests/testpi-5.c b/testcases/realtime/func/pi-tests/testpi-5.c +index a1d93cc..70f02fd 100644 +--- a/testcases/realtime/func/pi-tests/testpi-5.c ++++ b/testcases/realtime/func/pi-tests/testpi-5.c +@@ -69,7 +69,7 @@ int do_test(int argc, char **argv) + pthread_mutexattr_t mutexattr; + int retc, protocol; + +-#if HAS_PTHREAD_MUTEXATTR_PROTOCOL_FUNCTIONS ++#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS + + if (pthread_mutexattr_init(&mutexattr) != 0) + printf("Failed to init mutexattr\n"); +diff --git a/testcases/realtime/func/pi-tests/testpi-6.c b/testcases/realtime/func/pi-tests/testpi-6.c +index b3c3e4a..f715eee 100644 +--- a/testcases/realtime/func/pi-tests/testpi-6.c ++++ b/testcases/realtime/func/pi-tests/testpi-6.c +@@ -41,7 +41,7 @@ + #include + #include + +-#if defined(PTHREAD_MUTEX_ROBUST_NP) ++#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS + pthread_mutex_t child_mutex; + + void *child_thread(void *arg) +-- +1.7.9.5 + diff --git a/meta/recipes-extended/ltp/ltp_20140422.bb b/meta/recipes-extended/ltp/ltp_20140422.bb index fa42358..8b380a0 100644 --- a/meta/recipes-extended/ltp/ltp_20140422.bb +++ b/meta/recipes-extended/ltp/ltp_20140422.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://make-setregid02-work.patch \ file://add-knob-for-numa.patch \ file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \ + file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \ " S = "${WORKDIR}/git"