From patchwork Fri Aug 21 09:40:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5402 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 21 Aug 2026 11:40:56 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f186.google.com (mail-oi1-f186.google.com [209.85.167.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 67L9esP2019454 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 21 Aug 2026 11:40:55 +0200 Received: by mail-oi1-f186.google.com with SMTP id 5614622812f47-49d4cb3ca23sf1464233b6e.3 for ; Fri, 21 Aug 2026 02:40:55 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1787305249; cv=pass; d=google.com; s=arc-20260327; b=ovcklp9jK8M5xtgWzwmr0CsscWMZgv5osNWNcIu8QE7U0i3c6HVH7XnVbvVTV65Lza P9vg4eW0idDy8If6O1syRPBbtdcKxBDk7nj4vdWOzCDCOp4EzVn4ZSobM643xENDApt/ epnFY/wx8Za4wXDuU13GAvSK3h4BETXTVSsU5nKDpm3ccDtPF+ax4BXFHGEIqlGXmNVF L9OijLIervxNzM307PrjmeYWhGR/tEBSNx0hJWUSTiSpUGsFPSGsQu+fSFL1pbqHea8t soKYm0TV7qim1MGwy9IevO68aO/TRRe665pz0AI7OALjGHt7DC4an4HIYAea+5Q3QvNE ZRhA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=TYqP8T2WeTVZYv9MAlDxiMTnuk+lK1xTlgCgZACDg0k=; fh=tTT2q+QxecF0sdJsziJT76bJjO88eXKp4bJ0dkSFX6o=; b=AwVptAl78BhixcQMVJNJICBT7bFrmnxpTmOG+QcuVKvTWDcMur4tP1078OOpffJphU e40XhrSRh/najJe+5VlbmvJgqoSKJksX2hqDtcKKv2OiyJOwVupi02t1w1w0o0U+WyrV RDstnhcmGePGxrFPOn24Vh/RdpEAppmOSEumdLxpUcw3Te93R69Sb1sQeyVl+ToojZcM 2Qv6Dm9oC0O6nKnuMeX5VF5tO1/bWkzw7ixoR2Us+N2kYeAHqzImbEdvhJvzG8KSKSvE JvmQx3E5JikNG5V/SDPsFYw9Z98jdJlIOsXctFFEmA6nt0PZMRyRKLIxA1eWgvzQjZnr TKRw==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IvjV8QhR; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1787305249; x=1787910049; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=TYqP8T2WeTVZYv9MAlDxiMTnuk+lK1xTlgCgZACDg0k=; b=yFgrRbMby+Ug+rBVg1wIev1G+7RBHwnBKM0vWEUrgk+PV2vNd6NN9irGn9r39TFdUl QcCOiWJEjqATRAuwxHorymvp1tpodIiD/VNEE89lEOZfjVdKEoYSJqKpWoDh4+NlS+3M l4KuyaS1eknVIPi7oYyF3DAhKagJtH4S3/F5BHB6pyzpiCgCfbZ0tMoDDXAtvZdOelqm w4q3fgypPikYkj8l5AtezjsXs82V7lRfpVndpMLM0gdA2ezQjUur5f2RRVsmew6MVnDF UEr3sfZzBnVmtVgg81mkwJyub6d0qJVkEdU59yYHWxmLrCQG8iredUDD5+8/4lFX6BgM /KGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787305249; x=1787910049; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TYqP8T2WeTVZYv9MAlDxiMTnuk+lK1xTlgCgZACDg0k=; b=XfJzyYWGrCIGlSMtYQYfhneoLmFMgJozyv703yS6+176fW+TznYnQmu7ZU9EAiwdZ0 v1FBVadlvBN3w8+UcZ/TMN5tyOKyAtrWgjstLzIp47eX25SL4r6i6sLkD55gbjvUp/zF VzU9PwzQCzo538+RLSwhtKh2hn4MlMWPFpFiNVLwnxD4ZeLZWP78ifF+url/Nn2U4fCm XTaxAvVCl33L4gRpcvOx1/WlpbF8nRtHlmhsaY/bRhS+00uhdWayvFG/2uoHWxpPOxKQ RxMv2L+clulKdISLYtY8Y4nH7eITusrwJL7fuTW8gV4sFxRtQIrMNQaL0DecPTMasCWU Covw== X-Forwarded-Encrypted: i=3; AHgh+RpVeiJikYc5QaM84br2ELOTRSPl0w/QQfGJG+Ve+2ZCK1GTxYad9dkMV+BX4gI/4zg9AG1Ibco=@isar-build.org X-Gm-Message-State: AOJu0YwghD3lRGIVYoUbpol/6hWP5zToXHTPvWHHasUvsbgRJdZyJR9U YA2QfDLryQ6bNz5YHeJkWxXeMDBDyoGFLNvhAuZEdraLlSqXSbKJXLid X-Received: by 2002:a05:6820:1ca7:b0:6b1:37a8:9b9b with SMTP id 006d021491bc7-6b15923c43cmr5185383eaf.8.1787305249255; Fri, 21 Aug 2026 02:40:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdfoYMAemyr2+uHJAk58vcmcvnil8LVwOzByKgC9hYkviA==" Received: by 2002:a05:6820:f116:b0:6b1:4240:85db with SMTP id 006d021491bc7-6b14865d143ls2406079eaf.1.-pod-prod-01-us; Fri, 21 Aug 2026 02:40:48 -0700 (PDT) X-Received: by 2002:a05:6820:858b:10b0:6a1:4040:97cd with SMTP id 006d021491bc7-6b1591cf267mr4063864eaf.3.1787305248322; Fri, 21 Aug 2026 02:40:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1787305248; cv=pass; d=google.com; s=arc-20260327; b=nHgWFEMGFi1np380o3vrGpERo2A7T6lZnco8w8XLikAuYd5IKlkHYp4MZDiMWEG0RE oIlZZBJJOQKTXm7FTb+zsIUIdq08l4pqlv+urLnO9KYH7QmR/nK4YYfopetgAJDvIEaZ 7b/oE1dB0oP/HGG/S8SS5hkLTdS0Cve3Zt06v3bUXEG5tdDZYJi/BZ41+FX4WcGW1xU4 Xev9Drx+Aqizqwe3X8uqrowlKBBLNqQLXbXIBb9Y/Sj+ptzrTxMXiK/6LK1nuJHdmIvN XhrKgHivn9CLUOI+85yo5G03XxmICt51ZzHSY/YH7h2wzE45N9VE4pjuPvBHS24/tspS KF9w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=qaQKvhQ+zmX8nstLjfn7JCHKvIWngbtBNe1m7n7+zTg=; fh=y4Q4sSo60XIDMfQl4kOzeqW/gQkja1RlhaZM6hZs/O8=; b=FaKl88H6Ch5H9ESSnjGbRUSkrBHQcgdgD3jMoeLN8TQJuxnbLwtqf7UD317IuG2zRP 5+PpKDvoTyuQHdUHqIX9OSwQ1F4H+9pO2cVenHFTV5dJkvT072sDcCVdzE84QutiiNSc bLvyrIsVE3fIg2YrNoPTF5iLuu8eH/T+XrtS++rNM7lyDckDOWVlKWdqrkfBaJ5O1Urf gpz9/5hRDNbeVeMrBxATckcMBcONDzFh5q3KVpPkuCZ2S4SXbtoDvxhNsIcOX/C0P0E1 XhBhhG53T3pzZdaKjjQKnx1rHEAb+fWQlKV6OVODNd+I3Tnw/u/kfcf0fp86cUl1xvJY cn/A==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IvjV8QhR; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c20a::7]) by gmr-mx.google.com with ESMTPS id 586e51a60fabf-4632a7a1ac7si147096fac.1.2026.08.21.02.40.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 02:40:48 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) client-ip=2a01:111:f403:c20a::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MWNT5pK27Z/4RYUadkQfOQXcHgCO5HfLx3jQaPE8NaU8buUmcRbBrat1Ave7SqGILXGlZl03w/aDgleRi8DQ/tXuO8Y0buI5lMdKff765xbPyW/16owB4JzOSdflvskIhvkOtW6NA4lDnbHpTqIMMH4LNhR51H3FY4nT7ZepGOuHTiD9V3NzEHKndfBXNonXQ2EXmh8YK003fkHsZazh8Z40YEgkbhPXc1fA1EbaTND+OhvpFTGfDZXMWNLsBwN4twGX+UkubCQJDomCzi4qcDQotMOCRummH0OrMgFyNeRjb/JBbgUeLoiEg24+Fv3JOZC+1dBIPn/rmP90vl/cFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qaQKvhQ+zmX8nstLjfn7JCHKvIWngbtBNe1m7n7+zTg=; b=QIJ7ji51l4jEwKfrvB9tjKdCWQnwxNFocrIgt5xlshsjlIyA7TXN4oxg7jG4oQULRpCVAKELeZjBjgiqL4MwJZXgeMfkgzvh2uWo12sdzzB8BW+y6vIQO7jdRqfjrJ7QTCdeqCU8BXK85MVTC05TUZOuBETNw8fKs492qC6bPjKaB6tjzsjSO4dMOE3p8Lqhr/GbySGN+KIdh8j9PkDu0TvbN0kvHZxlRtF6G0wmPXQYL+sL4sRsVylM50Omshh997npjfTqEVWulX27Rkfam7K0v5CFsUp/i4B89YeSTrsRmg1a+VhZwrjmtW3HdqyGZdK1MMEYnC/i3d/IXzdOsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) by AMBPR10MB9374.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:6aa::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.11; Fri, 21 Aug 2026 09:40:46 +0000 Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c]) by AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c%5]) with mapi id 15.21.0339.008; Fri, 21 Aug 2026 09:40:46 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH 2/4] testsuite: fallback to diff in compare_repro_image if diffoscope is missing Date: Fri, 21 Aug 2026 11:40:36 +0200 Message-ID: <20260821094038.1816837-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821094038.1816837-1-felix.moessbauer@siemens.com> References: <20260821094038.1816837-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR5P281CA0052.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::11) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|AMBPR10MB9374:EE_ X-MS-Office365-Filtering-Correlation-Id: db67789c-5547-4d25-1396-08deff684711 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|10070799003|1800799024|23010399003|11063799006|3023799007|56012099006|10067099003|55112099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: tjLALduXr5QyHVeOivmZ3nze+UtuUH+4oISRu7TbL/aokKJB36+YUzXHfr8PDBx50TSafLnnfz1JjSAy0VsjFC/wdSP9e696kJ0x7oM2i3jvcgm4HigW2g0sgUeG1ToIw+lY4sR6wtyRVR1U3udNVrKwjfUNaST9GnJZTYIpGa5S99BF9tRMc6t+fuRR4/9x6nNghS6nZbP26LCD/EfLqJ5ITDRPoeFqB69KPHmlnqy1tw5OzMGGaTS52nsW1i7ENlhDqqktTAWUb2ztw/OKHdnIiEigRtJDh6JdMRv7sW8Oj/8HYC6XeOW+Px31LHpwmpcqqwbMmiZ+M3bUdCqAnASNFxX+fkP9zCZafiNwGlioMWdS9XLys1MdLupjlWMkRSAiqL0grBJrZRzxHx4sNjiMPvyK2Kqhhcdd+qm/DujkEslokHlEKdGTOiX36KVSFXRij+trbI8Fxg7JKq1ofpZOUPNu8sX1wIgmOsk7eap66WEzv6eZJ07Js3SBex8GHevtAnYvLinIkv9Ddg1PJA1uRo5WSn5TjXIgGxWw2YZTuh40ULmjRr52yJsRVAiEfoA95QBip33sqLh4Uw9+xRAT46dK1CDWZ7FOY/kKvU2/Gh+qDZ6cVBIX8zRLtPdnm9IfSz8ElCO7aXdLdlIyAYjR1lTy/etWPgE0Fm+NVH8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(10070799003)(1800799024)(23010399003)(11063799006)(3023799007)(56012099006)(10067099003)(55112099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: nYd2N9zVD4NAhLvRd3cUsN1VOjE53uCMKCRA4fSo//fRKtLSyhBgZKHFXTdPEJSluLOelUWHZVA6PRf/zm7ZTusgcdOf9lrd+zdyCdaXegnCQRvv+jcSYEg8TOP2nIvmUzp4sleJBie+bLaXRhrdXX+Txh/05QNWOWLWNvq/eMj1pKDCfVr7JGr/bF/zwh4X9TJ+o3hdjkIkqSybApo1frp7ma8SguhykNC57ytWexg3mtDhRoDdxYbrv7CBcfz/UMPkKfPOM3VweY3EK1itXylrRrensLWOOg6S37mt+usWTokqytAXolaC9jfX6h0AS52oXPc6yvyf9wTyiAKHN8TIvdioXJmAqggUF6Wthnq5ZkMjy3ac1P7r7bL9EBMhUhDzw38zbaVwCWat673nYUMtVNR3XAQe0CzhdztEZfjYUwK36spAbma5qyn9KdW4vONu536iHOP5eWCRbgKXA3JCPfzSE0dEh/+fK2rhq4gZiAZS9v1mAhpc61mYSC+yVYmefzqb3FwuVesLWM70uQqCm1ZUygtRn3G8cuFEcwAFukkOdiGi5ueE7DdmYp38of5rppJTlJbXxFOmhSKvdOoMmU98SloMr7qTUGMWtjk8DijLoO1y4vj5vYyb2weCY1AX5Zpg4yA9+YVGyaQYWiKyIpGV1hy/GVpYp++GhCJ+EkK65eDJxVUu/pVNozct4Oowq5rQl+w3BlemaC6zPp7/K6GmtDmHV6H4XeQ7uMg/sTFXO/aqUCqIQiwF+15EF6/j+NDs/OH5jPMTauu8l0ztQ7Jjv1asoGmMV44AhX6sEE1DjNpQH6UczxorwyTCoCluyh/UpvDz4vR34tgsRLKnQ5wQgBLcUIPLVSxPPK5DLiOOxWLLQmFIXBPWJxsevkfj7x7fHy5K0Z/y3h4Mm4YcjEu3g34JmwoMz9BVZF4YywS9mXH/NvmmCnW83sMV6OdLUmzVCKGKrJEEg2alKvH83xZLSJMcjvByEFJsLSJv43zeOZf64x4pEjetCd+KlZP2IPdVGxCCQSDAEeMoyKUgoDoTQyBAlOf4Bd1VLpB2cExbbAhS9JIX8H2yZ5vjMSgaoBG6UenF9AlIo2VnnSOMu/prwyw3571ZiFHxJ62iZU7pgDcXMzlUkURIWayxoObEhkxX+eGUCiovRg6AKkmSbUgFPsXngGnuqAvxiNpI/pPmR8SN7kZn/A7OIfD3sFKHPcN9jemDM4s5KS2jZXEzQie/LmtuedbV7u1BSEyQ9rv9WHp1exkvLFc6XWfVNEowwmQ/4QfZjz3RXzhUuqYRnMHrWlkCi92rjE2TcXIuh3HQ1K+jWFTQHqJ/AWt4x38nzlH4sHJzPbdfOJ9LcY8/Py0EhLHDf3i/SpcAc/qM7F3Ku+VkltQnHQK+oyIdc6M0vWBTZj04OnPQG8+B1x7RGR3zSTSJLCdfs3QbI4lgQeciKIg74pPAO/yXTSKZYD9KTdFO2aEuX9JyZVHOyjI+okflYkTjYufkHesTEWmByNi9KcS1zUBeu9BaEc/GD3T/BAoPP4bWWzVj8ZwJJwxY9Gwq4pbp+HOmYlQGJL2woEheN1mHU0aTUAHKacq/RQNOLDtDuAYJAyziX8jeCxzCTj3tCANjs2gv6l1XM8KAZOWE8Qkb2NA/wrGZblq7Naip4AF6JH2F38s/llsMFmJos88yJbTZWSCnTQk7k/mN62NiWWTVXGefxTguw5fTZ4vRkpDNC+s78VOj/9GeY5w5WG48yWXECasCHns3PaxcnlrytDvmW3z5CujBJiJGrKfsTtSB X-MS-Exchange-AntiSpam-MessageData-1: zNU+OHvLUmnIJC4oFRyAcKVCBlq5WMbT41U= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: db67789c-5547-4d25-1396-08deff684711 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2026 09:40:46.8751 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: alP1CQd+em3w7n9YxbKi59oaSTXqC7WIMk2OC2kXvbhtPEOM5PA7o/jRa8SVD0Sx4y4I+fCSuVfVESULZ5fawYP1csAROpj6S3Ai2vmufP8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMBPR10MB9374 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IvjV8QhR; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= When running the test in the container, diffoscope is missing. This is not a test failure, but just makes the output less helpful in case the artifacts are not identical. To still be able to get the binary result of the test, we just fall back to a hash comparison, using diff -q. Signed-off-by: Felix Moessbauer --- testsuite/repro-build-test.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/testsuite/repro-build-test.py b/testsuite/repro-build-test.py index c1b51aff..eb2cb3b1 100755 --- a/testsuite/repro-build-test.py +++ b/testsuite/repro-build-test.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 +import shutil + from cibuilder import CIBuilder from utils import CIUtils from avocado.utils import process @@ -68,8 +70,13 @@ class ReproBuild(CIBuilder): self.log.info( "Compare artifacts image1: " + image1 + ", image2: " + image2 ) + + compare_cmd = "diff -q" + if shutil.which('diffoscope'): + compare_cmd = \ + f"diffoscope --text {self.build_dir}/diffoscope-output.txt" result = process.run( - f"diffoscope --text {self.build_dir}/diffoscope-output.txt" + f"{compare_cmd}" f" {self.build_dir}/{image1} {self.build_dir}/{image2}", ignore_status=True, )