From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 63483 invoked by alias); 4 May 2017 10:28:16 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 63456 invoked by uid 89); 4 May 2017 10:28:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-25.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-he1eur01on0133.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.133) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 10:28:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=+YZv4ofqgxRRS3c5/DWjV6vEWDqi1pXpvj8lJbxfHRM=; b=k6jeJFoSIG8lcBJSBj/V1F53q47Lx5zYsftKCWFpwOSiUUSNtrBmwDwcl5w4frpPW3EbN9lVmiHqUrJib3b/s9Bs8M8Sktltebi5enTUIO90EGJp6qAOPx2LMdV0+tLr/kiCGSCEWRH+SAye/k08ekkxzYhfiUPAC3zEky2AoEU= Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io; Received: from [10.9.78.56] (62.220.2.194) by DB3PR02MB235.eurprd02.prod.outlook.com (2a01:111:e400:9410::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Thu, 4 May 2017 10:28:11 +0000 From: Ulf Hermann Subject: [PATCH] Have diff ignore line ending differences when testing To: Message-ID: <4541dccb-3392-c1cf-f939-16ddb84b1686@qt.io> Date: Thu, 04 May 2017 10:55:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: HE1PR0501CA0014.eurprd05.prod.outlook.com (2603:10a6:3:1a::24) To DB3PR02MB235.eurprd02.prod.outlook.com (2a01:111:e400:9410::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8bb35b27-83c4-4c98-7d7e-08d492d8441f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:DB3PR02MB235; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;3:hAXvJwlafeQHrEyAfiK/IQdlwFODwuSTmM+zqHH6BdSjfXzkpSfBnEpEqWZWDVH2eXmRma2OvA5NOuyTmSOH6BwKHufD28QIg+oJ/+rQOmUUFHn3jqxGcIj/MZbF9AwJ7vQQDS8W2sWtgj3doY1U1XqXiSoWd84esgcB/2/XA3lbwjC+oFt7qRWiXjQexZZ593PEqzrAds5Cd3TVkeA13OTjJb7OSYTh8CDmy7DdPt8TQK9fg+3Wzcg3LeDfIU/7RgHzGWnn3srn4dn0l7A+n8i0F8jXpm9cBol9BDYbB7UbYXCNvaTH9B/3oMEeE6/RK+SaN5KXJXTA3LDL/yvHHg==;25:wcc0VzJY7M6vPN9XC19pCI/b/PL0oFdFD4aFDvQlDgBxd5AhGi9ghLQcQdb2smCGWHtBIUR5S6ZgHztKw0dkkOwIKJapTHlWm4cyp00u4vMy3PTvOmA1+V7l7ckoZWPfjmWNIUIeuJiUDqMFmiiH06cLr+7r/6jQ/5RTPWGUQ/4Jeup9bUcCVcKs1iHRqyTI1Jan/IuzkJhWD+cL7jT9oxDd9kwSJaVQuh4KA5s3gCRvyBlPYTLpLenOhkFgpKqxKXsvTSVacBxE51WhmSR7o7neHnU2N3DdG+d16KQDdw7ecVDCL9Tk1IWKagJQeZRHsF0WtgeUOiZii3+doc3ZQTfOESICnkpnUm5LcDiAlAYYdjnpZh1950oWuKpUTn5LjgVi8isvfGl0tUGid9By1uN0JwGO4ybwUiurfur5UqX7t7hO95EE+2wUfyHAJGjYv6xUfdwha+/UfKGvMoL9FjjgiWVRDvL/JeyRkXC6MGg= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;31:Tz3HfmUWvuU3Z43QqU06d7NYNg16DN7aOeEw52QKPhoqFj28SVMtB/bZemjy+0ofGW+XS+sUX9dxhr8tRqshoP6SHajzXwTYf6mkOc8kmSRX6dIgtl8vj/asL3R6rmdnris7PC7iddYL07eC2OhZB3Fk5B85lo2ZW9Vtt7g2T8nrFQAGgsxvJddOefdgWD0rj2NmIU2oJIYQcBwogD+SFiKwA2wSjxyYYrfzfrqPJEsJIv25lvjTEIiwFDZ5inmfwB03kNgirUY9gLi387b8tg==;20:aSZ5BsZUdtgz5QY6nOm+BT2nDDKxMtlAQyrqzVw/9yZWxvCWKdQl7F302TLjKmA+fMUL+Ml1d3OUPa2K7RabDwn9xrsf9AQ03Axg1vL0ZPL2b0DhkqKRcYThFjTsWxJeDa1wW0TwGeW1gAXwzjwEG7iQaqmw3IDypioS9ii5wdYKOKOrWr3guvKSNCHa8yYp1u2U4kGSMUwAMWIy/XFYxIgQbgY3fdZale42wn+UGvzpVEnl5DlG/UfhrAMDaLsV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123562025)(6072148);SRVR:DB3PR02MB235;BCL:0;PCL:0;RULEID:;SRVR:DB3PR02MB235; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;4:5pVIxceSY68AN+uaYQZswLrcsh8591QHKqE7tmpSOJ0bToWPLwl/5lqbcujPCxsqWfZfWZTtzJi9jXbIl5ayu8K+Z899nx64YmEojfW1j1uGqFqO/I8lgJnbvI3oivzNe/ioouCsbx2klKSr8EW25Zn0LmkWNIKILITr6TJJ0g/91BZIspNp9AbBjL3d45ShwnQfly/gdBB0qZFxbATleZcJMSAWnQXJyG5pXpWvQFRl5GWCwjbBv0tnDsBdBJk677yiLZZ2TKF5TlmesPFl79a+KIimyBeau72+CGENvask+Jc+9mopyf2MFApj3o8Rpn+V3T6AlOLPIk4chLbEzodyoykn6Osvwv0esm/lLxOYQaQxoTthfHoglM0Iq+y2msAS+r7gDD26vbNHC2Qu/BxiMNsGdzwa7a+zoC9wiUUluZwmHUtUeWJRq89yYoHt5aHPAfgv/zpvyNYUw91XVEIY1nUMCaplxvq7hiTw7IybodM1+r1dlRetfIgs2p2BbBJZnRFZhf2BTId8bM+Hpuw4260+aQ7RcfnHnuHb032U0mW4DI4hHZl+1cDPLpn/6mJKouJlIDUV7aIt9WGSkvJCua2RlYwr89wrZwVs5A2U4YrsogyaEi6feDV7eM57L4prkIVvsa7dlmB4t1mHNkoysIVKQ8x3bAg7H6EakedrkwjEYbeMl9k3VF8beET7gac8MMHg1ZuTZZg5mGl8/t3SwfGImRb0Ji5n+hRS0tdelZnECD2OizF0LJFBd2gLYeID+aLi2SarADr7FaBiqqAwa3PkuzayaDD0xywHDp0= X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6049001)(39450400003)(39410400002)(39400400002)(39840400002)(377424004)(2906002)(53936002)(305945005)(38730400002)(65826007)(110136004)(230700001)(50466002)(54356999)(7736002)(23676002)(50986999)(4001350100001)(189998001)(47776003)(478600001)(83506001)(6116002)(3846002)(6666003)(6916009)(5660300001)(66066001)(2351001)(31696002)(6486002)(64126003)(33646002)(86362001)(77096006)(31686004)(36756003)(42186005)(8676002)(25786009)(74482002)(81166006);DIR:OUT;SFP:1102;SCL:1;SRVR:DB3PR02MB235;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjNQUjAyTUIyMzU7MjM6M2RPbTRNSFBaOWlzUGJab2RtdjNweUFBUVRI?= =?utf-8?B?UVMvS21GZmlnbldDc2lEMEJFb2YwRm9BclRlVjhJcndtVTl6K2FIY0V5OXlq?= =?utf-8?B?dGtQeUtSUTRUbHA3VS9VZkV3RTByMHNHVzg1QXNoVXYzS0kweHpkZ24vL3dD?= =?utf-8?B?bjdrN2NZd3dVZ3EwL0tYcHk5NjdrZnRLOXp0bHl2OVhmdXZMWDFNZWgzS1RH?= =?utf-8?B?eEVDWFRhYnVuZWx4RGZzYjlRM3A2YXNtQ0VQUUl0MUFqZnVrSy94SGFUMUpG?= =?utf-8?B?WlNLcW1zbjlvODAzSmlCdHRYblZXTzhnR3dZanJRc2Y5K1duWU0veEE0VlZy?= =?utf-8?B?R2RMQlhsSG5PRWhIQnFyME1McTBqNllWS3E1NjVZd1QrSHBncU12Nmg2WnI0?= =?utf-8?B?QWJzcXRzNUpKYk9GcGdEZ3gxTHZ5dzZSV2lIOUJjUm0zU1N5SCsrYTBFRFNp?= =?utf-8?B?bDZpdmpXMXc1YWVCUDZqeGo2UmsreVIyRDdhUG1ROG5HME1sTEtLVmxZbDVl?= =?utf-8?B?bzZ1di80Qk1tQit2bEFOZEx3dWNXcC9wdWxqN1Boclh6c2ZzUmVrNTZ2bWZC?= =?utf-8?B?Qnd6M0E1a3VkZXNNbDlYOTNZTlFnaWxKSE8wSHZ5RmFYVUJCaEZ6QzBLdjZR?= =?utf-8?B?TWQ2S1dLZk1XQVdGeFdNYXJYVHZnYXVpYk1LYkZIRVo3dmR2ZzFpV3AzSVJL?= =?utf-8?B?R3JuaGwySFRxaFE0RkFQMFNXV0dWSXpJM1RHWnBmcnVLTFNvY0ZqRWU3cWIv?= =?utf-8?B?Y3ovRkJhbTZ5dXFPMDM3ZWxLc3Y1M2txblZ6N0RWVmxFSUFNMVJ5TFp3WjFs?= =?utf-8?B?QW9Yay96dkN6STFPYVY1WXpiUjF0aVd0R0xNWHdMSUhTOU9nS1dyUUt4LzFH?= =?utf-8?B?WkxkcnU3ME9HY0tkMDM0c1lVMkovUUNsVlFyQkhnc29VeVNLZW5TZDN1ek9h?= =?utf-8?B?K2J4MktYNGRKYXRvZXFJOE5pdVNhTmRlZHZWSzFUZ1hON0hQTnVIZTVLK1ZT?= =?utf-8?B?QlpPSFlwdWM3WlcwTE5NWlNlR0poK3hOeHpXczM1TTJSczlCZGczZjJuYmZK?= =?utf-8?B?aFhZcFZXR2N3a21zQUVHZjlQY0kvTmM5TTJBbUdzZkNadjA0TENnRUk3UUVU?= =?utf-8?B?TCtHUTBWNkNyVHhyY0lqcW45VnJPaDJQcFJhZm95TmhkQ2ZFRXBPY2M0aVdP?= =?utf-8?B?cmJkV2ptb3pUdUZYL01yZHZMazZ6bkROZi93R1hNZEd0NW9JcElBWHhOYTh2?= =?utf-8?B?V0NCY21zdjA5SG4rc2wvQWthQW1Ed2pxMzRpVi85cG5KNTZVazN1K3BsUDZn?= =?utf-8?B?OVpaNzNjWnpJWTdyK3oyTzN0M1VHdDByTk1RRTVVQXVvTGlkeUcyYVAxMzhs?= =?utf-8?B?bGhrQVFRNHA3a0VvNXpTM2hmTGFSRWJHV1hoRkRlK1dqOUVKSTR2VksxU2cv?= =?utf-8?B?cG9OeFo3VkwwMFJDWDB6UUMySWhKQjJFMnVlRnN0TU12MFJjVlQ0OVFZME1o?= =?utf-8?Q?JX1KIWrykMJiBxx5oJoT00AeMzO7VN1YbyREuvwc6oWFT?= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;6:fmr0qI+k7ewKtVxhP56+5FQyIbyPzhmR37NvLkcuiMxRzWxNJTyXAxhuJmnN2XbVT0jOayUSAo/0eGaPnEGetg58NnomcB0m7QhkwVlZfD8jeKpBKx5Ang8HMzoThLqutrh3hmE7wort573CAvgIttLJrciaIU+l3hZfDqI68BakALRqaBeUj9RcpP/RDR0jSAjxSrgDdqK+o4XOt+agkGt/wb6XioGPY3mCh9RIn30IlMCQsFUufqsMer79F+37V717wcf5GJ33NdPMmE4PKj5GUR8OtRR4h0XP69sKhDCEw4XU+l9xmJo2YGEyynL+RpfE3MflCRlm2bFy8+MKttC1Y04ylEKR1o7GRHXaZRufFt/e8A0Q/DmonKIGXAJwZ/yAx1lyORCNzj9D5L+rlc4OX9qzTWB4hRJdf0zkd78DuHhMVhlmOhjv8iAnM/0jyXVQKXdS4l1gnItttOUMVRy7ZESnE1PWeiZpltA/y57Ztobubqa5ZaAg+tQJM8xulVuxFfnP8q5XxIya7WfVAw==;5:RWxH62ZwrmeMCyiZewG1fuPgXW1CTpZ4ehB7edx65W/aWszuakgqEQKIYaeDDBaRtQm+zu/JxuLBVaN7mwynhSqG/7tfctSCti1pUSi0mVZhsjyibhqJ9GT4STB5CWLH03cIMPMLW/RQuZOvXkTCMg==;24:66srBTi6cXf3KKRXI2qlH9c3O39YALUs+i6BfqFWkcYwT226ORg2afCWKnGq6BWjIp6xOI77gtCy8ExRRVR8AcNc3YUOMPRdaEATCF5L2G8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB235;7:c1c8uIk+SEo6NoN4WXU9miZmEybY6MTwaKCY9WGFgFJIqCcIOQsTQa2vDldVU3HrOV0M2B0LBoKpi/T1K4RpAieplvSAwkfVg/TJuGNUl+5YqAkFBlkeYMtmISPn/BKC9FJjJ2drUvfdQGRFVc/12nKOpbtDn4Bx7qA+CuhBn8mOVg+MmDd5VmRi74ddplcdb0g40IOBkdZuX/e5rndomTe1rvh1kuZX+gfBFi/IgVImEt9q6vmz+Ed+wuFqmNvsA+nN8WXhxoCP+2OPGYPlpteAN4SsGfMY63VLZIbg/BwIx8RLCIatUafSkWsiGc+hBmgqbm+DGfmVMJtGx/Hc1g== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 10:28:11.6685 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR02MB235 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00170.txt.bz2 This accounts for the CR/LF problem we get when producing text files on windows. Signed-off-by: Ulf Hermann --- tests/ChangeLog | 7 +++++++ tests/run-addr2line-test.sh | 8 ++++---- tests/run-readelf-test1.sh | 2 +- tests/run-unstrip-n.sh | 2 +- tests/test-subr.sh | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index b091ae0..5616c74 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,12 @@ 2017-05-04 Ulf Hermann + * run-addr2line-test.sh: Add --strip-trailing-cr option to diff. + * run-readelf-test1.sh: Likewise. + * run-unstrip-n.sh: Likewise. + * test-subr.sh: Likewise. + +2017-05-04 Ulf Hermann + * alldts.c: Open files in O_BINARY. * allfcts.c: Likewise. * arextract.c: Likewise. diff --git a/tests/run-addr2line-test.sh b/tests/run-addr2line-test.sh index 1079c3e..0dae42d 100755 --- a/tests/run-addr2line-test.sh +++ b/tests/run-addr2line-test.sh @@ -56,7 +56,7 @@ EOF echo "# Everything from stdin (with newlines)." cat stdin.nl | testrun ${abs_top_builddir}/src/addr2line -f -e testfile > stdin.nl.out || exit 1 -cmp good.out stdin.nl.out || exit 1 +diff --strip-trailing-cr good.out stdin.nl.out || exit 1 cat > foo.out <<\EOF foo @@ -65,11 +65,11 @@ EOF echo "# stdin without newline address, just EOF." echo -n "0x08048468" | testrun ${abs_top_builddir}/src/addr2line -f -e testfile > stdin.nonl.out || exit 1 -cmp foo.out stdin.nonl.out || exit 1 +diff --strip-trailing-cr foo.out stdin.nonl.out || exit 1 echo "# stdin without newline symbol, just EOF." echo -n "foo" | testrun ${abs_top_builddir}/src/addr2line -f -e testfile > stdin.nl.out || exit 1 -cmp foo.out stdin.nonl.out || exit 1 +diff --strip-trailing-cr foo.out stdin.nonl.out || exit 1 tempfiles good.addr.out @@ -105,7 +105,7 @@ cat good.addr.out | testrun_compare ${abs_top_builddir}/src/addr2line -a -f -e t echo "# Everything from stdin (with newlines) with addresses." cat stdin.nl | testrun ${abs_top_builddir}/src/addr2line -a -f -e testfile > stdin.nl.out || exit 1 -cmp good.addr.out stdin.nl.out || exit 1 +diff --strip-trailing-cr good.addr.out stdin.nl.out || exit 1 echo "# Pretty with functions and addresses." testrun_compare ${abs_top_builddir}/src/addr2line --pretty -a -f -e testfile 0x08048468 0x0804845c << EOF diff --git a/tests/run-readelf-test1.sh b/tests/run-readelf-test1.sh index 4725049..40b664f 100755 --- a/tests/run-readelf-test1.sh +++ b/tests/run-readelf-test1.sh @@ -28,7 +28,7 @@ tempfiles testfile.temp testrun ${abs_top_builddir}/src/readelf -r testfile3 > testfile.temp -diff -u - testfile.temp <$outfile2 -diff -u $outfile2 - <