From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 48067 invoked by alias); 4 May 2017 16:00:51 -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 35544 invoked by uid 89); 4 May 2017 16:00:35 -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.8 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=3311 X-Spam-Status: No, score=-25.8 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-DB5-obe.outbound.protection.outlook.com Received: from mail-db5eur01on0118.outbound.protection.outlook.com (HELO EUR01-DB5-obe.outbound.protection.outlook.com) (104.47.2.118) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 16:00:33 +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=WByuHWK3fyDbN5NZk9NNWcmimuTb4aZH8qEMilGnbVw=; b=RmyRoOuyPn3Pu679cnvAE92wPw/z6Siq/jJMu5bVHILwQb187Lt328ZlVLYoqW49izJWQ7pL5hzpO/4ub0NYes460ANMStkhyzxoSOMazFFzAdyy2m0Kp0zcxocJU97/Rk8wQ6vOGyvIIFvQenDSnNpiNdWZ9kHLVcmoKZsmx2k= 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 AM3PR02MB228.eurprd02.prod.outlook.com (2a01:111:e400:8810::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Thu, 4 May 2017 16:00:20 +0000 From: Ulf Hermann Subject: [PATCH] Correctly determine STACKCMD on windows To: Message-ID: <297995a1-b3d4-3ddc-d6df-c2453f995a49@qt.io> Date: Thu, 04 May 2017 16:12: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: HE1PR09CA0074.eurprd09.prod.outlook.com (2603:10a6:7:3d::18) To AM3PR02MB228.eurprd02.prod.outlook.com (2a01:111:e400:8810::26) X-MS-Office365-Filtering-Correlation-Id: 0b31c410-fc08-4ba9-230e-08d49306aa64 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:AM3PR02MB228; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;3:4gHH+LYG7/1WzfM6arQgXGnHTflEWW1DUqj4PGkX3brMOzGB9MOXuHy+AYRG6lblgrXF1cPuu0BJEnb3ezRcztGt6E7izkwqBVCvhb98ntWXFumVljHpsXWXjfrfslTvkvmycwCQJU6TahA5VfwLVTyfHigI0jx38FtkHe7h3wqhpE/32af9FGLlv202zE8BYTS+6v0+erZCZHpfU3ELECYVq3mc+rfadUNfIkXsUiVn3TIqV4NsRcSqw/pLTP6t9EtAFC+fsLzdy1cTwv9XUVkza2dfX1wrNEXdcfqfJp1ISX2bZJvjMCGMuv8H2hCR;25:7Es8YncogCl5B2NPCl5MmVvFFXTLGn9vJwMbDBoJGD7vyingx25t1qSVEAnVhvrtmGnGe86eZGf5orTx/lBXGbfCWZrJKdLpwMmSdFYzJx6yleHe/4QOA4aKvCxa7dvuyZsssJvRzSBfzGx81k0hELVv5B0L9AzwoYstk2fTGIAKnAb3+yyBiMqr39Cae080wg2gDX3XXrYM6BZYi0rZ6swL5/MbE+hLEz9+TKpN6Hen91y9crZgqFx/tDRVUuB5IW2ppxDGaLP1dx5jxJeNWf9Q4zzw0bPYdfwLRWcKMB3227ZRoxnqX92U1GZ46PmPQI3YeXTprlwqm49x9uRCJlKlSOmDK+aNIbNZTBB3Ro+YdEWUlPYCa3/xWGW9keWKFZHBjPUFJApjpBrx3X2o1++y2qLs88ek5r6QCPgXfnsUam0dhZD5LKwouJunX/wkmB8zTBT3mIjSoFDhJoFsMg== X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;31:umehCmVd7jv0g9VZ/JFoqTp0m9sPiJRbe8HGVNdq07DcaQGDQ464c26xFmrJn+GjbpRsxdaYzGckPow5mzojbWLlvFkkI9Rj9qvjSaWY7TbYhh7YRL5sbyrSNqWQzc6OsJ5tjn0aZ2DCGUumW1W7Xs35yXnsbHnX5IUqhRKOCAKCrJEIiaatmxiOc4ynw4VLQwJCQvzr4RfGrT65C+2LozFi7Zxq//U3twzjMQkmOE7M1vB436ciyRGnRiFibb2uJePaVOHwTQXbGAp1Pm7ZnQ==;20:Ho7ffsCIsxwJun7+5m5IoKF8bpC27JBbf/CSZkdmeJhHGe00gBV0jtPYtvUChhqyBPy5g5SFO4eqAi0OfayRWww5NSErdDSq5UMBqjVMncfD74M0NoIYQJ8h/Gkwt/7Obc0jfudFJ/4eb3AVciemjYBnWyXwGRAFgOoBRmb7Dx8LbDApud2+DmntiwzPiLjZsYREVh+OTVykuk4DBvTZJs9/dn+pmbfUDHcvZZowAl01tK0WXzk9padXcFZnOljM 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)(10201501046)(3002001)(6041248)(2016111802025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(6072148)(6043046);SRVR:AM3PR02MB228;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB228; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;4:VGziJvMo0bvx9ySUdcIW1k5sK4ttR5D9AXGKICTljgnUHsAYpmhh0+92lWozAcpk44ucbniihUJfUc9iiMJxF82F3z0Fcj7uZpj2zmZYplG2GE1yvi976SObN8E5PoOPQ/rzQGMuw0xrtBAToG7jBv6BR6LDaqW4LxhD8SM2Uo+gBcGbgCR3yOAXChy+GHsW8ovA8gnKSuH1RrUnqeKg9b7lAJXIlxOE4aSYc/zQTepm7uqiKfflxZFC99XmLZ0Vg/vPtw5bQPgn2nVEJirLE7rp4meP/tai4gvWx40eoyeIbHtyl3xZg9gXSFbjOBPWZwOdhsPJ3/ay1WwMRP/b3U5W8PNP6oJZUlas833U8WGeKZhbO1dhJDMP1yUBVSiJnAulgWy7JSm5aH/b39GfjNWxiw/59Hhb2+RKIqntk7CFABXI9zRkEAx3nBOmN3o4Xcpe4TlP4BiFn5w5iSQ/DgFs0iVAW5GIde5gQObnIzwtaEpygJKg6bKRXz+/J7tuEiGelbnGZF4PdRIAmuUXPjvTZPXePXzAL/Fyg/mKQETCBFs4d0hb1FA+9mLpJa/dHK4LbQL+rj7GnrmakX7Pq4iWvshiNq72iddOztHJ2Oa+X6ohMU4lhIYttF/hU3Ub8Ek/GIf6W7VBz5B7UdRcItdpfH7Ajl1ra7J6M1Xhn3rckeIkEcArpCb7P2PCOdut6XF1KxPSW3LK1OLrE2B0NH2uVO5TLxhvitkmExu8azODwYW0yah4OVP2tHouSRJ2a6grHcH4P1CESfaByfMf+QGra0T/QKWj75MUb04Pyw112mj37dsoi91uTOHJCJ5JIbCf9S+RKQbzgHBrH0KAYA== X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6049001)(39840400002)(39400400002)(39450400003)(39410400002)(377424004)(2906002)(65956001)(66066001)(189998001)(6116002)(3846002)(36756003)(47776003)(2351001)(4001350100001)(65806001)(5660300001)(23676002)(478600001)(74482002)(6666003)(54356999)(6916009)(230700001)(8676002)(31686004)(77096006)(6486002)(33646002)(31696002)(81166006)(38730400002)(65826007)(50986999)(7736002)(53936002)(25786009)(42186005)(50466002)(305945005)(110136004)(86362001)(83506001)(460985005);DIR:OUT;SFP:1102;SCL:1;SRVR:AM3PR02MB228;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTNQUjAyTUIyMjg7MjM6ZWROelMrYlNrc0xuZlFZTHc5WlhacjZ1WXJF?= =?utf-8?B?OVM1VmJtR1ZTc0RDSlBIVkw4WGVPZVZUdFY0OERqOTRDdXF2Um45Tk5nQVpB?= =?utf-8?B?UXdocUU0T2lDWWlGK3dqQUFiQ1ZHTXIwRTQyUU12bk1vWStwMENnU3BUQ29v?= =?utf-8?B?aTBRMnpRTzR0NGJMZHNNMlpzV3ZoM1Z4OHhmaEp1ZHFZRE8vSVZWMlo1MWtz?= =?utf-8?B?V0lCNWpNTjQ4dU9kc0llSlMzZ2pCcDJDUUVjYUhZL0JERlcyMHF0L083WEhW?= =?utf-8?B?U1p6dnlOQkJoKzcvRzMrcHVRaVo2eUYwaitidUFwcHRYQ0l2T1liOGpxUzUv?= =?utf-8?B?d0xnVzc0QlFDTVdpSDZLUml3WFZZNXJmN1BpVENOT0JKZUhsaHI1WElaSHlI?= =?utf-8?B?Zzh5OEcwUzFMTW1yWWhJOGdwNXR3ZmdDdnhVTzlFaEtwL1ozRVVNblhyWjdz?= =?utf-8?B?b3ZWbnhFSlJOUG9GRWcvdVIxTklselNadlVZQVB3bGdZbjdHRzBBMGo4czFG?= =?utf-8?B?djF4SlNnQUJrYlpHbCt5K2pzSXVzQW9ZN3BLYXBwWVcyMzFvcENjYWxqWEpp?= =?utf-8?B?RkhnaCtMTDBiMThTem54NSttL25lTVMwVUZIK29zOUpYbGlGWWk3WVdacXdx?= =?utf-8?B?SE5iK0xLTDMvbndlUm5ZQkRDK29nbmgvcTFYUFIrNmZRa2FxN2VFNUx1V25p?= =?utf-8?B?aFFERERxY0ZLV0dMUnRaa2tlRzczbGdML1MrN2ExVUQvc2dpZGV6aUtkWWM1?= =?utf-8?B?K2NuTVFXcnh5ZDFQekdnTEhjRXdnOENrZyt6NVNKdUZoTm45aDE5aGJlQUk0?= =?utf-8?B?OHlQL0w4UjJVRVNPUTZzcDNlUzFNQTZhT3JwU2xmeHRaY3FmcHFNVElaczg3?= =?utf-8?B?K3AwSzZPZ0RyWXBmSGh3L0dnSndOSmU5SDR3VW9NSFd6ZVdIRHNzYnNpOE90?= =?utf-8?B?cXNaZjA1aGRCOWlTY29nTkNoS1RnMi9Reks2czJIMFZaMzI3dlNnSm5YZnV3?= =?utf-8?B?NzhjbXM0QlFMOTY1Rmkyb1NPQ3g5cjA0UjFHS0wwUE54QnRPMG1WMytJSXRh?= =?utf-8?B?QUVUQUY1VVB3K3MwZktQL2t2Y3JuY0FDZWtiQ0xNVWVudUxoY0Z4UTlUakVl?= =?utf-8?B?SU4wbUYxbWloWVFZTFlFbEJ3bUhXUE15UnFibytjT0JDbHdVT0h6VFcvUUxU?= =?utf-8?B?TUY0Ynk3WHNoc1FrTXYwbjl0UVUyczUyS0MvajJMSHNhR0MxeHRaR0xDYTBz?= =?utf-8?B?N0ZRVHB3ZENncTBnckUxVDVTRzBQdmRSZk1aL0pYVUNUak5pajRrTHpoR0JF?= =?utf-8?B?WjBhNk5UYXJaSnhlSEh3V1hJalZkVW9GODlGZmV0aFlyVU5ySVRrZHNKSDlN?= =?utf-8?B?UkF2KzRrMWpiZmVoZlFTSVZsanZocWxCeHFvWTRTWUd0TXJSYThOcVJ6Szgw?= =?utf-8?B?bnJFM1EwYmppMjhkUlZJOWR0NFhrK21peTN2WnAzZjh0cGtQMzdqcVphb1Q1?= =?utf-8?B?MnMyamlSa0ZIcXBaNDlwRmFYdlNhd3U1cFVTZ055Wm9HTXQvSUhIclZkeXF5?= =?utf-8?Q?9A7RAXeyNJDxMPIXtsb8SbMV3QBB51n2GYrzu14/KBs=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;6:GD23jiYCtHbwUMv7XXE0IC6i0b+vCkuoeYtew0wnrcC2yfvXs6vGifxDreCiHZWQ3z4zdpMJN+3E0p7oBfmBGq2rHl76D5TY/fHkyV6jbGxhjTYoCZEc3thXwHmKH5g2J+tpzIAmRcS3+9TRCOuj+3SHMFM/ixviJp4GwhKxZfGzsHpF27wqHu+vQZVW4at9qust5qBE+ne5G5uHQkHtCAIKg+AmxSwoCg4Omb9+QXYTV+DatR7KlnutQgMEeXa0lNfM2d4TShK9xiekOaiYrgV+Uc+z9txNeyAB8iDMPWMLaI68UZqm59zWir8bfTLLt2gT2IwkN7FXrlb35fJIvAi0p5NkXQXR9oFc98VRvfbtioPE6UQ7G2Z9Nfmh7AI2Masr0LkYYj1lq1/w2VHYsuU68mI3AK49Kuncc8dLPabLiqgqvYOL2Qp23dylRMR05Liy4lhLbXmQaCKXv578hDKw/ud9tkggKBJtVG+HxH2KwU+LTorY0DgfPP74S9Dywi514zjIBy2cTcg/tNiiqw==;5:L+O/ov1Cu93r665XDRJKvz1v15O+Dc8X0eMLGNxZN4MbO4Of0JEsw0f0z6JxJXPrgpn4TCCQ2rwkCI1X8lNB4j23Nh9izHRqnrRECA6Qoz90OfoLRodEL0y4gZYQLKPy5iI8WnPmElAYftMQ7OR4Gw==;24:MncOZ1c7bE+RlIKeFa7tyJXsPs3OzjZaHOwVzQaOu/AYB4f5h0URNTuRYcnwWJcyxQN9rvN/ALrmeU1wkozYGCRmunBKAbA44nk2oMD9VsM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB228;7:8/9DxOR3tbdK/apSeiCjKk6dAQHNtv10CEXw3YViAcwYimeki38tBIMEENKQHmQXnCxSFZaEJpGFU6xh9EOg0x47dAqUK9KrzReQDmDbKdc37UM/uxYfwzOgZ06w63jdzjdJ3XNhF/hcSpBDKn3kwM054bv+/pm2n81T0aTxOTflPN+oYdmb4MWGBTUaZiUS9ZAJ9cBY9k4QYk6RPZpiXHKdUp0nj0bCCyi9myhAzXlv6cSJaRHg/9lMeysHqWP9l7R7KH01qrbelfS48hy/WqC7U3bLs9oZ6VPbqs/h5JDy3gLQh1OnIoPc7FH4fC0LO9hOE01OEzLK69qtGi/yXQ== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 16:00:20.1456 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR02MB228 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00181.txt.bz2 error() will only output the file name, but with ".exe" on windows. Signed-off-by: Ulf Hermann --- tests/ChangeLog | 6 ++++++ tests/run-stack-d-test.sh | 5 +++++ tests/run-stack-demangled-test.sh | 5 +++++ tests/run-stack-i-test.sh | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/tests/ChangeLog b/tests/ChangeLog index 9c04404..f43aeba 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,11 @@ 2017-05-04 Ulf Hermann + * run-stack-d-test.sh: Correctly detect STACKCMD on windows. + * run-stack-demangled-test.sh: Likewise. + * run-stack-i-test.sh: Likewise. + +2017-05-04 Ulf Hermann + * elfstrmerge.c: Use 07777 instead of ALLPERMS. 2017-05-04 Ulf Hermann diff --git a/tests/run-stack-d-test.sh b/tests/run-stack-d-test.sh index a9f0380..ef3c6e8 100755 --- a/tests/run-stack-d-test.sh +++ b/tests/run-stack-d-test.sh @@ -64,6 +64,11 @@ testfiles testfiledwarfinlines testfiledwarfinlines.core # the error message, which we also try to match. if test "$elfutils_testrun" = "installed"; then STACKCMD=${bindir}/`program_transform stack` +if test -f ${STACKCMD}.exe; then +STACKCMD=`program_transform stack`.exe +fi +elif test -f ${abs_top_builddir}/src/stack.exe; then +STACKCMD=stack.exe else STACKCMD=${abs_top_builddir}/src/stack fi diff --git a/tests/run-stack-demangled-test.sh b/tests/run-stack-demangled-test.sh index c26918f..f6899bb 100755 --- a/tests/run-stack-demangled-test.sh +++ b/tests/run-stack-demangled-test.sh @@ -33,6 +33,11 @@ testfiles testfiledwarfinlines testfiledwarfinlines.core # the error message, which we also try to match. if test "$elfutils_testrun" = "installed"; then STACKCMD=${bindir}/`program_transform stack` +if test -f ${STACKCMD}.exe; then +STACKCMD=`program_transform stack`.exe +fi +elif test -f ${abs_top_builddir}/src/stack.exe; then +STACKCMD=stack.exe else STACKCMD=${abs_top_builddir}/src/stack fi diff --git a/tests/run-stack-i-test.sh b/tests/run-stack-i-test.sh index 3722ab0..a09e46d 100755 --- a/tests/run-stack-i-test.sh +++ b/tests/run-stack-i-test.sh @@ -25,6 +25,11 @@ testfiles testfiledwarfinlines testfiledwarfinlines.core # the error message, which we also try to match. if test "$elfutils_testrun" = "installed"; then STACKCMD=${bindir}/`program_transform stack` +if test -f ${STACKCMD}.exe; then +STACKCMD=`program_transform stack`.exe +fi +elif test -f ${abs_top_builddir}/src/stack.exe; then +STACKCMD=stack.exe else STACKCMD=${abs_top_builddir}/src/stack fi -- 2.1.4