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 20587A0597 for ; Wed, 8 Apr 2020 05:15:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 439E01C069; Wed, 8 Apr 2020 05:15:00 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id B1B851BF92 for ; Wed, 8 Apr 2020 05:14:52 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200408031451euoutp02ac79fb4112c187b06cf7d8994da7a284~Dubd_ZHXW1520415204euoutp02x for ; Wed, 8 Apr 2020 03:14:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200408031451euoutp02ac79fb4112c187b06cf7d8994da7a284~Dubd_ZHXW1520415204euoutp02x DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1586315691; bh=eWKfuyzJ/4Kv3fP8aeQW/Vnu7OJaUhy4egd6L5FLCCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kp1pd81hFarVeRgumjMz9rDWSRqvfCsqYuagbw2/T45fHgvRIduDRhPfshh3H1I6R kdctEIK053yDxs9ebcsX21EeELo+uJ1RM7TlnhaO1EtktQjmkhBZtST12UMKqbAx6h 9/+NOzOdfnUp0Wz0b6kKau6ABwmrMcHiXd9wBMko= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200408031451eucas1p2a8e420fc0f1ebbddd9796fd3a45f88ad~DubdgS2jE3010930109eucas1p2g; Wed, 8 Apr 2020 03:14:51 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 87.1A.60698.AA14D8E5; Wed, 8 Apr 2020 04:14:50 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200408031449eucas1p1ca89719463cbaf29e9f7c81beaec88c2~DubcOtPeA0246502465eucas1p1P; Wed, 8 Apr 2020 03:14:49 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200408031449eusmtrp14a59d67cc43257ef48ed5c5986a420f4~DubcOJ0KX1153511535eusmtrp1t; Wed, 8 Apr 2020 03:14:49 +0000 (GMT) X-AuditID: cbfec7f5-a29ff7000001ed1a-32-5e8d41aae868 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 6F.69.07950.9A14D8E5; Wed, 8 Apr 2020 04:14:49 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200408031448eusmtip19322579c55db4f496b30edf6d02b31df~Dubbm4l-X2966429664eusmtip1a; Wed, 8 Apr 2020 03:14:48 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Pavan Nikhilesh , Jerin Jacob Cc: dev@dpdk.org, stable@dpdk.org Date: Wed, 8 Apr 2020 05:13:42 +0200 Message-Id: <20200408031351.4288-5-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200408031351.4288-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRmVeSWpSXmKPExsWy7djPc7qrHHvjDLY+NrV492k7k8XESSYW F9dZWPzr+MNu8enBCRYHVo8NJ/pZPX4tWMrqcezmNPYA5igum5TUnMyy1CJ9uwSujCN/uQva 2Cp6Zq1kamDsZu1i5OSQEDCR+Nd1nLmLkYtDSGAFo8TEZ11MEM4XRok3DXvZIJzPjBJPH/xm h2nZ/HAfVNVyRol1T6YzwVW92nqOCaSKTcBW4sjMr2BLRAT6GCXm7xcGsZkFFCXurvzKBmIL C1hIzOnpAqthEVCVmPBxCtgGXgEXib8tB6EOlJdYveEA0IEcHJwCrhK7z3KB7JIQuMwm8bpj NTNEjYvE8f5tjBC2sMSr41ugLpWROD25hwWiYRujxNXfPxkhnP2MEtd7V0BVWUsc/vebDWQD s4CmxPpd+hBhR4k/84+DhSUE+CRuvBWEuJ9PYtK26cwQYV6JjjYhiGo9iac9Uxlh1v5Z+4QF osRDYupxW0jwXGaUaNnwm20Co/wshF0LGBlXMYqnlhbnpqcWG+ellusVJ+YWl+al6yXn525i BEb+6X/Hv+5g3Pcn6RCjAAejEg/vg8SeOCHWxLLiytxDjBIczEoivFK9nXFCvCmJlVWpRfnx RaU5qcWHGKU5WJTEeY0XvYwVEkhPLEnNTk0tSC2CyTJxcEo1MCo5VS9I7/pokhj59usVyVvb pavz/ixMisiQ/qwjfHfCREnW7l3zr/5dv/nNxi2fGBPPRJ1PnRPynv34x8AsVdUv9SdUXvCc 5ru0/4tSamH8HykWw3zJ/cfWlZyzmX7qg6LOkn/mc6dc/z9jfY0279WAldUH39wtaG2xnXhm Ymwi1/F7+x1nZN5VYinOSDTUYi4qTgQAeURKxfgCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCLMWRmVeSWpSXmKPExsVy+t/xu7orHXvjDDYuU7B492k7k8XESSYW F9dZWPzr+MNu8enBCRYHVo8NJ/pZPX4tWMrqcezmNPYA5ig9m6L80pJUhYz84hJbpWhDCyM9 Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jCN/uQva2Cp6Zq1kamDsZu1i5OSQEDCR 2PxwH1MXIxeHkMBSRom7W98ydzFyACVkJD5cEoCoEZb4c62LDcQWEvjIKPFyVyCIzSZgK3Fk 5ldWkF4RgT5Gif+fDrKD9DILKEv0bbECqREWsJCY09MFtotFQFViwscp7CA2r4CLxN+Wg1A3 yEus3nAAbC2ngKvE7rNcEKvqJQ7fvcw2gZFvASPDKkaR1NLi3PTcYiO94sTc4tK8dL3k/NxN jMAQ3Hbs55YdjF3vgg8xCnAwKvHwPkjsiRNiTSwrrsw9xCjBwawkwivV2xknxJuSWFmVWpQf X1Sak1p8iNEU6KaJzFKiyfnA+MgriTc0NTS3sDQ0NzY3NrNQEuftEDgYIySQnliSmp2aWpBa BNPHxMEp1cCYzHOE9+mXhCW+T94dSm181PznxmGxld0rl/0o9NA56jdpQtbn1Ux9XCwJLUGT n05Qk/d8tHm2mM8dtZgd+vfYFos4GK2TTZ5539K+nGHZ183/K+pTplaU/nsr0+byVddCoPJQ 6nybeX11E8McHXTW84vOXm/J/Sk1XfhRHetPxWmPd+5dtmqCEktxRqKhFnNRcSIAvDRlclcC AAA= X-CMS-MailID: 20200408031449eucas1p1ca89719463cbaf29e9f7c81beaec88c2 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20200408031449eucas1p1ca89719463cbaf29e9f7c81beaec88c2 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200408031449eucas1p1ca89719463cbaf29e9f7c81beaec88c2 References: <20200312151654.7218-1-l.wojciechow@partner.samsung.com> <20200408031351.4288-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-stable] [PATCH v2 04/13] app/test: fix macro definition 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" Wrap RTE_TEST_TRACE_FAILURE macro definition into #ifndef clause as it might be already defined. Fixes: 5afc521eac6a ("eal: add test assert macros") Cc: pbhagavatula@caviumnetworks.com Cc: stable@dpdk.org Signed-off-by: Lukasz Wojciechowski --- app/test/test.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/test/test.h b/app/test/test.h index ac0c50616..8ac581cbc 100644 --- a/app/test/test.h +++ b/app/test/test.h @@ -22,7 +22,9 @@ # define TEST_TRACE_FAILURE(_file, _line, _func) #endif -#define RTE_TEST_TRACE_FAILURE TEST_TRACE_FAILURE +#ifndef RTE_TEST_TRACE_FAILURE +# define RTE_TEST_TRACE_FAILURE TEST_TRACE_FAILURE +#endif #include -- 2.17.1