From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5B814A0093 for ; Thu, 28 May 2020 18:25:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4B6E01DC2B; Thu, 28 May 2020 18:25:21 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id AB7551DC18 for ; Thu, 28 May 2020 18:25:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ev5LgnKXl3VY2hCe76equ5+XtF7Kjil/uftFXuKuWvM=; b=YlHfv4abZ0W67ZBMXMNv3v7cMbbYPPCUN3gUruMxextDzzi4pmhDL0p07qhapvfQEZMQuT gxDjVv0rQxsCTGUCDun+iJMXAMTP0zlgtYLfWsNykWsWPN2Qkakx9xey6k9NL7PB2LmS/L bqGfTdM8b63rTa66Ni1VkFUkKSARJEs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-451-_lOMGnIcMeawy_lz6P6neA-1; Thu, 28 May 2020 12:25:15 -0400 X-MC-Unique: _lOMGnIcMeawy_lz6P6neA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1FE23800D24; Thu, 28 May 2020 16:25:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DBD260C81; Thu, 28 May 2020 16:25:13 +0000 (UTC) From: Kevin Traynor To: Lukasz Wojciechowski Cc: Akhil Goyal , dpdk stable Date: Thu, 28 May 2020 17:22:30 +0100 Message-Id: <20200528162322.7863-43-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test: remove redundant macro' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/0b837f27950b59b60463f8cdcc56eb313a83a080 Thanks. Kevin. --- >From 0b837f27950b59b60463f8cdcc56eb313a83a080 Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Thu, 9 Apr 2020 19:24:53 +0200 Subject: [PATCH] test: remove redundant macro [ upstream commit 27ea35b743aa3c735d04848b5c795ae0b8cd311b ] Remove RTE_TEST_TRACE_FAILURE macro definition from app/test/test.h as it might be already defined and cause build problems. Also it is good to leave the decision of additional logs to the final user of test.h and rte_test.h Fixes: 5afc521eac6a ("eal: add test assert macros") Signed-off-by: Lukasz Wojciechowski Acked-by: Akhil Goyal --- test/test/test.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/test/test.h b/test/test/test.h index 7c24432303..705a311068 100644 --- a/test/test/test.h +++ b/test/test/test.h @@ -23,6 +23,4 @@ #endif -#define RTE_TEST_TRACE_FAILURE TEST_TRACE_FAILURE - #include -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:01.363263742 +0100 +++ 0043-test-remove-redundant-macro.patch 2020-05-28 17:12:59.110556197 +0100 @@ -1 +1 @@ -From 27ea35b743aa3c735d04848b5c795ae0b8cd311b Mon Sep 17 00:00:00 2001 +From 0b837f27950b59b60463f8cdcc56eb313a83a080 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 27ea35b743aa3c735d04848b5c795ae0b8cd311b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - app/test/test.h | 2 -- + test/test/test.h | 2 -- @@ -21,4 +22,4 @@ -diff --git a/app/test/test.h b/app/test/test.h -index ac0c50616c..b07f6c1ef0 100644 ---- a/app/test/test.h -+++ b/app/test/test.h +diff --git a/test/test/test.h b/test/test/test.h +index 7c24432303..705a311068 100644 +--- a/test/test/test.h ++++ b/test/test/test.h