From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611339840; cv=none; d=zohomail.com; s=zohoarc; b=lXcAfNBYba9rHyt96qhdqMM7h/YiY9WPUBynjtngswYay2dtPyEkx7Csika0k2Wf4LwGECxowIF772TPkm2g9Oh/nfzGn59C7uxf/7hNlAyN7JU3XH8UWCXVvOOAv6vL5c3AgjqvVBsMMrEmP97fUD4ovCxnFGY4jsQ0uzyTNNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611339840; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=jTSyRFqe7yUAWFOkB+kfkxGHlak8/OvROOtr0Js1SgPmBssSXwntMgfz3EuFsYkM1Unsm1oE07JK24LUcYxKyHZOPg4mxLCVDX9p/x6VzOFBNylTVYhZ8C8Ef8wtEvYrJfagqNGkuenzJ8mulKW7wNjl3I7OW0pFeGlgOtSmSPc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161133984060422.60690473205966; Fri, 22 Jan 2021 10:24:00 -0800 (PST) Received: from localhost ([::1]:47974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l316F-0005nw-DI for importer@patchew.org; Fri, 22 Jan 2021 13:23:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311Q-0007VZ-Qv for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:00 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311P-0006qI-A9 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:00 -0500 Received: by mail-wm1-x336.google.com with SMTP id c128so5150183wme.2 for ; Fri, 22 Jan 2021 10:18:58 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l1sm5833353wrp.40.2021.01.22.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B89901FF87; Fri, 22 Jan 2021 18:18:54 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=qjMKYb+ClrN97Yndcd74T/PxkgWG7GskeMe6oJTx/R0KZUOlJC2j7hQbtb/4JgMneV BaJm0KSJE4a1uy39X742wCcW1FPWPRoby3gAQ8o7ArJLXtYTXTCsJlxiqAyn6tSLlFVK htFcAQcghQot6O3fQVVrWbrCY2poG42j68SHAjFfz1qQB7T0ZXZeKoeEiVnZErLHpV2m ABUxFfHQMYKUSoLg4GWEfqZ5vbpjDk2KR0WK1ZPCg+3o4hcmOUIUD95ZV+7+AFJgYlWf eV579ihJ1fwr50xpQjM/3+Zo/t2bhHHANURM7Qr3P0Nip9C6ktpUi53Wnw8Qq45WIv4r ijlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=JhfhK9e1RUXijGkBrPu/a7zWS/WSgtHw7V6Xg9yjB/RAbQYWj51kNIfXOIlwFc85bc 02Gs0EKh76FrHY7oTpqsRokqInlddKRaTKtwQ46vftKiW7e0BqCQom+3nv3quiTNQ6gC bt+RZQQVnstweimX6i2Ei151eGmW6mNwTSSoWQnpUk3OnWmVzbhK2q4j5kbIISDgxmxM mv4XydiaRu3wygnkL109HjqcB1ti1ejjASz8pER41GGlawO/cZeDSlfr6XXLnRhxVOiO y+o7Fuq1ZuUCRzCQ8yZg0dRAVS26wRJXGA2Q6EKbTarDlDvZary1CjcmebYJULIGVr6S pWMA== X-Gm-Message-State: AOAM530gUiWP8Jq4YQXmJjTQjAAzh+UMGiYcAgrD85a36HfL7KGTxjDk bKP1495nfUURDs0N4Wlf7dShSA== X-Google-Smtp-Source: ABdhPJzxniy1Wr56RyX52X45sQr4iD/xdekcRrDf0wabRPBxTPViQ5rPsoH0LXmCQa78x2JGSNW/Cg== X-Received: by 2002:a1c:bb07:: with SMTP id l7mr5235147wmf.102.1611339537478; Fri, 22 Jan 2021 10:18:57 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/8] tests/docker: Fix _get_so_libs() for docker-binfmt-image Date: Fri, 22 Jan 2021 18:18:47 +0000 Message-Id: <20210122181854.23105-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Fix a variable rename mistake from commit 5e33f7fead5: Traceback (most recent call last): File "./tests/docker/docker.py", line 710, in sys.exit(main()) File "./tests/docker/docker.py", line 706, in main return args.cmdobj.run(args, argv) File "./tests/docker/docker.py", line 489, in run _copy_binary_with_libs(args.include_executable, File "./tests/docker/docker.py", line 149, in _copy_binary_with_libs libs =3D _get_so_libs(src) File "./tests/docker/docker.py", line 123, in _get_so_libs libs.append(s.group(1)) NameError: name 's' is not defined Fixes: 5e33f7fead5 ("tests/docker: better handle symlinked libs") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210119050149.516910-1-f4bug@amsat.org> --- tests/docker/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 884dfeb29c..0b4f6167b3 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -120,7 +120,7 @@ def _get_so_libs(executable): search =3D ldd_re.search(line) if search: try: - libs.append(s.group(1)) + libs.append(search.group(1)) except IndexError: pass except subprocess.CalledProcessError: --=20 2.20.1 From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611339689; cv=none; d=zohomail.com; s=zohoarc; b=N1PxpnH6cI/uK523a5vL98guYyv7/wrGEImxquKh/jr1pPf6e6j6RSGi908hZqxmSHgMb+1+AmiJZJgKk2gOTgQKhZdvmqyD0E2Q+UJ2+ondSv2vsOyCZ+aJgJdGs4U8CnPZp3Zdc+Z3XoOE2k162600prPpyAkkvUiF56eu6BQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611339689; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=NTtC+HJl6LdVkuslil5VN9I9Vglun2DiHcvZLVbNpwrReS1/6DMKDIxVY/6AqWWnZYIxaqJ8TqCQwCaoa60ESwgAQsoOorHpLyMIVMPciFXFBZBLVov3DQZ+qM0KlUGNQe5sYLRf68uigjEHPsR2OY1uWInaozA50T3zDOPRsQM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611339689476271.98790868115475; Fri, 22 Jan 2021 10:21:29 -0800 (PST) Received: from localhost ([::1]:38098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l313m-00014j-Lu for importer@patchew.org; Fri, 22 Jan 2021 13:21:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311V-0007Y2-4u for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:05 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:46240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311T-0006rE-5i for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:04 -0500 Received: by mail-wr1-x436.google.com with SMTP id q7so5941879wre.13 for ; Fri, 22 Jan 2021 10:19:01 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f14sm12228461wre.69.2021.01.22.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D00F31FF8C; Fri, 22 Jan 2021 18:18:54 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=L4CKDPG3h/ELlAHycAPDD38TFU6PiRrQXH8ClGXPRCVUHLTEQGDF4p3n0S22OCY60W 8n/hPlzmS35PbsFB7BmNqYkm3lo7rH85STsB7unQ7XYQSVfuaH9gyNzZNzKN17h0PLDM MP+ApkvTW+rukSch0Av+peBjRvFq6LxymZrUzrRol9SH1rUoanwW+DyU+SQ+vnUIPh0G +jqO5kEIvTOc36SdtCrkjJq/UwMjbCpuQJZvJ0xUZ7riL5YQjes7wv7o4sHGexrMkFwu 7pAC5SxN5n4Mp9P+FJVwVNkGfSJWIwQLKM7CM5SeU+fcXn9l2h98SEdCz3hcyr6PBCXZ 783A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=N89HftY2RaQUF1+RIJ+0BzW8l4q8nRp6ocFNQwp0H2ahnesX92a5L6ubIwcHjdj9IJ CVTwKBhHzDBLEmxzp32gc3SBw0jFW8sRggcH96HjC2ypCfwEE79c/CVDI/s/mwJSeCGu ICKubk4OyONrjicW48PCvn41+B64ruq5tKYaGBAW9pSnusPuJ2uuFt5ttSVx65DdDrup Q/cNRdfm293BulKsuSoHjAUvTtWbiahS/okiQQ2HoznigMrUBZ9tXgHwxefQSVRKq7wg 1CoeHXEzILBGvM78BPLZDypwHlBcfB9LxpVyNNx9Us9/yWADpUS9CRfFgN1nr9vMNWrb Oy+g== X-Gm-Message-State: AOAM532jJaDI70hC8maECd/8I6me/sDmRsxgKcQXLlVaQvuEzRFaThEr xBl2vDKd8EKPbWkaROTuYfzNMg== X-Google-Smtp-Source: ABdhPJx7saTyzTdrXPUB34EL8t9fPp91LEJLJFg+QPwTsBW5yQg+1ATWsABb1JkHZeGUGMPZY8vZ+A== X-Received: by 2002:a5d:55c6:: with SMTP id i6mr5910057wrw.145.1611339539478; Fri, 22 Jan 2021 10:18:59 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/8] tests/docker: Fix typo in help message Date: Fri, 22 Jan 2021 18:18:48 +0000 Message-Id: <20210122181854.23105-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 To have the variable properly passed, we need to set it, ie. NOUSER=3D1. Fix the message displayed by 'make docker'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210119052120.522069-1-f4bug@amsat.org> --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0779dab5b9..bdc53ddfcf 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -209,7 +209,7 @@ endif @echo ' before running the command.' @echo ' NETWORK=3D1 Enable virtual network interface with d= efault backend.' @echo ' NETWORK=3D$$BACKEND Enable virtual network interface with = $$BACKEND.' - @echo ' NOUSER Define to disable adding current user to = containers passwd.' + @echo ' NOUSER=3D1 Define to disable adding current user t= o containers passwd.' @echo ' NOCACHE=3D1 Ignore cache when build images.' @echo ' EXECUTABLE=3D Include executable in image.' @echo ' EXTRA_FILES=3D" [... ]"' --=20 2.20.1 From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611339973; cv=none; d=zohomail.com; s=zohoarc; b=Uay4OmIYFYJnogehgLP0JB101telhpxRBkF6WQzV7seTPAZJr4IOT9Y56KEYQbErntzhul3dORuAudtb95rk125mATxcw0PcAWMt9vsKordvQdAguvvsjXB+2vedTBkKjJDgOP8bSYO5vWaAvtgDPXdiJqLd5BKAd0KHUs8Ib4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611339973; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=JhOpYNf1AUBSm7Em2ufHpRaZwc4RYoFDyUwQshUtlJSpvZIdRQYp18PkImEfutpEESvSm3Q+LXaEnUbCPZ4Uw4vnAZHsH1aKG79JgTrjq1jBG88YTe1DsIfY1bEEyXZk5iJeYmVHCOApk3p50mSwpA5EL0Lzx8iXbk6lvCT6iOE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611339973150339.41605395889826; Fri, 22 Jan 2021 10:26:13 -0800 (PST) Received: from localhost ([::1]:56428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l318O-0001cl-3z for importer@patchew.org; Fri, 22 Jan 2021 13:26:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311W-0007YW-2o for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:06 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:39676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311T-0006rL-5W for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:05 -0500 Received: by mail-wm1-x32d.google.com with SMTP id u14so5156585wmq.4 for ; Fri, 22 Jan 2021 10:19:01 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k1sm13206339wrn.46.2021.01.22.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3E461FF8F; Fri, 22 Jan 2021 18:18:54 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=uwF760ms32l6bWLtm3doQiSQPHauyeiUQC+vKshg5CQFbLmVfuKKbyoIMHIKx353fs 3ldMM7/YBMfRp5MVB1nKfAxwLFsbIaENh4kSC3qxKxepPgl+6S2hbSbO9EvO5gClV/Ku i84A9X+vaRkRZQA8KXDGdZmydwAI6p1xGH7TawWQCiR5onP3i/aEIhV98QF+65P049KS ujUj120+0MkXukJ0F4O/O53eUO79FDf0LocT7P+oYq28oIzZSOSMPLtX9o8ymt8frrhy e6J2nBviB2swy8URf4SvjJlBLbOB744j9obtApoPd5+T8Q9EpDwcmA4YdMX7grdXkBcq Tacg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=l4RhevhM/zAf24/Q7Sp1BzZKazis9wDVrSanrqjYE7Vfg9sYORqlkXP/SPZSBxXqdw sYwFoLuB50XZsfQ+7Jc8km887Yi+8/8Y+aovaHqlO6gHV8NcfReoYxnbVRiGEGKKyk0U 5a4tXsvlgSKQw/439okCqUjkj3xyeGG7V3u6dynWWrogxu1AUu259CwFGHd0Jgy+VgO4 Mb9IdcF/Z2NLBRkZ6ZQzmCk5qfjseiCp9Mjw3yDTmez/k16mNi873C7FPPJxAWW8doh/ UVRy1/gZn9N9bcn6epas2VrL1TFm5D0bmLgSaY0h+2tJPgi2JLPb1yZBuXxEXy1Gahk6 yNrQ== X-Gm-Message-State: AOAM5335WO/d/LqdGWtXfgmcU8xxhAmFNN7A3GdJQgsR4iW5hgGD6OZA tcKTHDEjsQFqD8e23jrQGb0RIA== X-Google-Smtp-Source: ABdhPJyxri0cD8DJCmbR8H/eyVKIfHR42eW38CtJDDUTG1FjXtYPX/D+6083NfwfRbXvHrlS0otQbg== X-Received: by 2002:a1c:2287:: with SMTP id i129mr5068157wmi.109.1611339540807; Fri, 22 Jan 2021 10:19:00 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/8] tests/docker: make _copy_with_mkdir accept missing files Date: Fri, 22 Jan 2021 18:18:49 +0000 Message-Id: <20210122181854.23105-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Depending on the linker/ldd setup we might get a file with no path. Typically this is the psuedo library linux-vdso.so which doesn't actually exist on the disk. Rather than try and catch these distro specific edge cases just shout about it and try and continue. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/docker.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 0b4f6167b3..fb3de41c0b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -103,7 +103,12 @@ def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): pass =20 dest_file =3D "%s/%s" % (dest_dir, os.path.basename(src)) - copy(src, dest_file) + + try: + copy(src, dest_file) + except FileNotFoundError: + print("Couldn't copy %s to %s" % (src, dest_file)) + pass =20 =20 def _get_so_libs(executable): --=20 2.20.1 From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611339689; cv=none; d=zohomail.com; s=zohoarc; b=hsIMPjMX6MIjmPjkAs23vYF7fGriFEdrTMQou+KzhEXAGaoqMlUr72ZPg3nmp/1X7s9dYtt5aBUcG9Kptmnw8ibTX8Yx3dCb8/+YicCHVuo32hR3gj9qJnNNwAkqgfA2XYqIaULFujbcEyEwdDR8zbh8U6T1x50ZRbBkg08XXFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611339689; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=g6AM7A2CwS0ngSUBq3U7Z/RkD2G2ABIa08wrX1IuM3ervAXUkoFCtfYlZho2vNSpHExqogVs3aTPnEi3M9tJ50rJklVbzTrkcOTHT5GKilIylBKArioBSt9KEenaOOxqEcEpIYHjhFtLznf2UhrJGz37SK6b96ju74DDbR8yWro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16113396894801017.0798031601248; Fri, 22 Jan 2021 10:21:29 -0800 (PST) Received: from localhost ([::1]:38172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l313n-00016S-7d for importer@patchew.org; Fri, 22 Jan 2021 13:21:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311X-0007Yy-27 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:07 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:54901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311U-0006rR-0N for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:06 -0500 Received: by mail-wm1-x32e.google.com with SMTP id i63so5103348wma.4 for ; Fri, 22 Jan 2021 10:19:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q2sm12187529wma.6.2021.01.22.10.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 060A41FF90; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=g85OQIQ6WyiSKxgy1XA50KLRQVouYdEGG5XkK7gN7Ls1iBxkOpD26e84ytE4x8oxu1 +wOP6+bRIBiZomY6UptUw8M9KWoDAs9Dt92D8b5fqRKUV6ybQ92HHwR74FT6kDs1c0lM z2AR09w+qmcJIvpmKpblNs+ZIumIrccaSCaxYPN14XO/dC+WfBcBz9zfEgOEE0uOhIOh PvfOym+LMnrCUQqmycD+k5n005MxQKCoFJKkfTK4mtntdWhTQgNbnWFmFf3LrgCbhfaC km4rRM+7xwKZ8NIB4ROVdp//RImMt5+ZCHeMt+nNqVVHbCwPQ2vUJ1Ky0EnXxGwkMRyl 1r1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=bJuQI8lOYa53A4ICZTqc/qAdb+4jCkYsaanflqy2hEdBwr4rSSOVSCjkU0++zsV0tO Bl8oySpGEZgXjRwC4leDqNd/9LjCSsM+tzIFVA47iHBadDRtxKQKNRTNov2KimQgq0HK Str2vYEmf+SRh8wUq6dmas7Eq7NBDuHkf+y0b4g2rFeXg5Y1zi7207U8j9D2Hwi7PyFq hS6Gd3y4LrCwyC2/vrhRzn6ZmQsuu5Un5TQn66qhEa+pLBY21Kx6e9ZHqR9zak78hZAK PG84jsTtIcZsSk1z9zaGWTXjC1VHomZ8HYPajxCGavXK2iTIbI1asl7c9RvhSjK6nBgQ LOjg== X-Gm-Message-State: AOAM533FqO/K1vhk9T63SD53ZpS22h+wGmPp8QnBkyS2/I9HNRZswl+d 6z5KQVLy6FBTCXqcy0s89uTHFvvgYQOxXUZd X-Google-Smtp-Source: ABdhPJxJRIDYsciM/YD2Qi6S9uIv5HHIB1b4hzojLVkoRbmiX6iKrb96OA/rZTl8w95H08+3I6WSFQ== X-Received: by 2002:a1c:9e4b:: with SMTP id h72mr5248884wme.116.1611339542760; Fri, 22 Jan 2021 10:19:02 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/8] tests/docker: preserve original name when copying libs Date: Fri, 22 Jan 2021 18:18:50 +0000 Message-Id: <20210122181854.23105-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) While it is important we chase down the symlinks to copy the correct data we can confuse the kernel by renaming the interpreter to what is in the binary. Extend _copy_with_mkdir to preserve the original name of the file when asked. Fixes: 5e33f7fead ("tests/docker: better handle symlinked libs") Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index fb3de41c0b..39da3fefcf 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -93,7 +93,7 @@ def _guess_engine_command(): commands_txt) =20 =20 -def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): +def _copy_with_mkdir(src, root_dir, sub_path=3D'.', name=3DNone): """Copy src into root_dir, creating sub_path as needed.""" dest_dir =3D os.path.normpath("%s/%s" % (root_dir, sub_path)) try: @@ -102,7 +102,7 @@ def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): # we can safely ignore already created directories pass =20 - dest_file =3D "%s/%s" % (dest_dir, os.path.basename(src)) + dest_file =3D "%s/%s" % (dest_dir, name if name else os.path.basename(= src)) =20 try: copy(src, dest_file) @@ -155,8 +155,9 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path =3D os.path.dirname(l) + name =3D os.path.basename(l) real_l =3D os.path.realpath(l) - _copy_with_mkdir(real_l, dest_dir, so_path) + _copy_with_mkdir(real_l, dest_dir, so_path, name) =20 =20 def _check_binfmt_misc(executable): --=20 2.20.1 From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611339827; cv=none; d=zohomail.com; s=zohoarc; b=I92yjvBUyAAIGLKEIRTAF8J0LUJuDnOAuZsLmZ3RJdFm9C3EeRKoR48BDD1y5P2gn9LIEjJjXmpAW1TvQ6UIM/guUglk/bOBD3ZuQhwSAkIDzL1Hmra3q43GV8UpuyDpNKa8XlCpp3+X62nW9Bnal2yxECcvmozvKwvUwNXDUus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611339827; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Nr3F1s/uxAkZsOjDBgzUMQ0nBu9JtUUnCgKnB3ia0u0=; b=GYBUiizJagY3d5sbeIpE+TsZBysMXDlyYn2ORJhnZ3FQN2NFiM2nFeaocmtyxMzLZQNJ6Pws6f7fXMX1a7Stf6KDuLwOEEk5YjERje8xMiYvhapkcH5RLme164SvgOabsyUkX5D6sq5bHloX7jT0Ml/HKPL5eBpzravWU9+6iIo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161133982768270.66893141838102; Fri, 22 Jan 2021 10:23:47 -0800 (PST) Received: from localhost ([::1]:46802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3162-00053T-KE for importer@patchew.org; Fri, 22 Jan 2021 13:23:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311f-0007cd-6K for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:15 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:39204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311Z-0006tk-Nw for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:14 -0500 Received: by mail-wr1-x431.google.com with SMTP id a1so5966953wrq.6 for ; Fri, 22 Jan 2021 10:19:09 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d199sm12232884wmd.1.2021.01.22.10.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C9DB1FF91; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nr3F1s/uxAkZsOjDBgzUMQ0nBu9JtUUnCgKnB3ia0u0=; b=Dfx5VBsxycuh2BYKdT4cTeeBCWfyqBl09LqOcxSVPHEeTXFEw6PDLQRk5DYtliTuiv 8Q5xfFIkELfcM1vtuR2fD+G10PkhISY/7EoZMGrZNRs7JGaPl0cKaCgAy93siLYVBZYa s6TrQr1GoIdXnVydjR/cUGQyLEIzyOnIpl6kpooxWoCP4D+5PUPvNV508u7elxIvSmKN co2/jXjThy6zSojo1tFZnXqrr8jhc3UR8PBROXICHC+WLKyiv3tpDwtdAfo1IauInD5F DMN90P7d3f3mY3kXblt4Skk5zAKnEtN5EFlZUEzL14zx18wxLjoPU3xxDgu0FBbvqqkU JWFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nr3F1s/uxAkZsOjDBgzUMQ0nBu9JtUUnCgKnB3ia0u0=; b=J+KiPZKsdXfuMPTUh0jqU7aoCb31IDMZX9bPIlMw/vwCSs7c3x14ZwaEApljepr4+a TfpndCxPQf/hN/iFkWx8/JXc/khH/86D1og5uKtdyGpxjAYtAiwYNM7/ft8La3CgStr4 xeknDDPVcKRfoopFxSuLYQQmxEJRhz6kIAVa3Ct4Pr3x6CSuf1J+MwalkzudEtHDQ5kd jEe3eLfxDEorvYjfOtxIWp3lY7lplmvWva1aIP3/KNgwyrdqJ5Rv2qe292Lgd3UgbNoV pxl2J9h14SfVdhqRjr5GTOC+xQOpy+Brlkvw0lQx3f+eM92AOiqzDKXeazzyR763K9FW 57bQ== X-Gm-Message-State: AOAM532WbqedFk56Z3R4WaCwHclzQVvfUeLJO37zNlRXQEalVbEszHnp zoSsjufkWODYItCUL2LoyQOqng== X-Google-Smtp-Source: ABdhPJzgq6A6h+wYrprDY2DQvRZjC+K0monjHMszHn83VYCzklKRgybUUM2tvOhFM/eYDmyHxcS5zw== X-Received: by 2002:adf:cc81:: with SMTP id p1mr5662034wrj.339.1611339548305; Fri, 22 Jan 2021 10:19:08 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 5/8] tests/docker: alias docker-help target for consistency Date: Fri, 22 Jan 2021 18:18:51 +0000 Message-Id: <20210122181854.23105-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We have a bunch of -help targets so this will save some cognitive dissonance. Keep the original for those with muscle memory. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index bdc53ddfcf..a5c1e4a615 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -1,6 +1,6 @@ # Makefile for Docker tests =20 -.PHONY: docker docker-test docker-clean docker-image docker-qemu-src +.PHONY: docker docker-help docker-test docker-clean docker-image docker-qe= mu-src =20 NULL :=3D SPACE :=3D $(NULL) # @@ -218,6 +218,8 @@ endif @echo ' Specify which container engine to run.' @echo ' REGISTRY=3Durl Cache builds from registry (default:$(D= OCKER_REGISTRY))' =20 +docker-help: docker + # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make # docker-test-foo@bar) which will do additional verification. --=20 2.20.1 From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611339725; cv=none; d=zohomail.com; s=zohoarc; b=jUkaBM/0e31ukMIDmcK6I7Z/a7VTDaVnQAGJwHwH7TfLopgGn90soEaOWAIBl/a73dTHxKSuLGe+XKBE4rWYRc0DCBwOapPPTMomu3f1MOogj3yRhveiu57XxJgDAjcgRXfyH2MVzAIjs4J14pvQu+g6WK2zPbvxFkXz5rJzGHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611339725; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=hEC/mOk1nHtXua50UpMdxqoUk4abnpIKR5ujeRNnOcxg2wyKjoUtTy33PQLeZG5TQfSMzFrdg2eylq8fuYsvGIOem/tgZziQjzfLcoXjSr1HYRK4+y4vSZBq/v7nZRFnYXbz5mQuqI2HfbDk6KtRGfkmlH7cJwbynJDDHzipJ14= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16113397251901000.0015333339937; Fri, 22 Jan 2021 10:22:05 -0800 (PST) Received: from localhost ([::1]:40728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l314N-0002JC-5N for importer@patchew.org; Fri, 22 Jan 2021 13:22:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311X-0007ZE-7R for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:07 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:52144) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311V-0006sI-8P for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:07 -0500 Received: by mail-wm1-x330.google.com with SMTP id m2so5108401wmm.1 for ; Fri, 22 Jan 2021 10:19:04 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 192sm13636662wme.27.2021.01.22.10.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 351AC1FF92; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=Q0ekPi8ddPsLqWk/bzAAyuQOjZVex9EEdlUKCZGUQJLW+Cfs0cDpxDELPJlzsfuSQs YnxDQEmRSdjU8dtnMDfJptl86GwsXKt5MRLfiFG3g79iAhqkaqxsREB4qkBcJ26IM9KK 11f54O7pFgrQgAGtb4dWWBoroYQNS1jStLBxh/58ZclnyYwIrjwBe0M4UKVBXOxqzbPz SelAsbec5NS0ts+0lJkhykzge18kqObgVwRZARD/z3BR8tmfKiRZPkTydw9CWO1cLYVP m6E2wB8u6wjQqip6BS6LgDW5FsK5xjJIoc7s5JFNnabw5CLhjWtpsD6MwyKET3QBYx1A ACUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=ZjFB9nuuJz+SkyHln0y1/6Jf7IUlCo0YBE/rTGtjaAp3UDElVO2UH7lNxR0xWwPd5n KTGcVjbmxMUJkVDvQPRG9x6zgTgMH/jwD5OwUXlv6clWGaEwPfFvzTb2hlKxvPfJbq3h JjmNJRWl3TDTRQ6QuDUaGjj7jdf/vFQX20oTp1aIELBrVzQweQjfL51OlQP3+bG3zvwv ObVt6s04HmUNGvrznMmNKFsPeyDmckop7KSmvna+HsmZ4JhrmZhitU9blZfz88Q9AfGX swI/mNAVocaUZrxvA6bt5tPQu12FLbL8KFaPeAbROm+0l/7u0p1k49MgHefwhZA6PojS EZgg== X-Gm-Message-State: AOAM53017QyJx8GXTXJjTx/lEglqDl6y9x9RudyBnevgeSP+mQRWU7c5 /RCCs3KJrBbbGWeV8pv4SINcWA== X-Google-Smtp-Source: ABdhPJysmkq+mZECXbqSFl1VqRXOChUh23n/m8gNEHrr9Z0XkYpauXNFJie27QHevBfgtgZi/bqQig== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr5220564wmg.66.1611339543951; Fri, 22 Jan 2021 10:19:03 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/8] tests/docker: add a docker-exec-copy-test Date: Fri, 22 Jan 2021 18:18:52 +0000 Message-Id: <20210122181854.23105-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This provides test machinery for checking the QEMU copying logic works properly. It takes considerably less time to run than starting a debootstrap only for it to fail later. I considered adding a remove command to docker.py but figured that might be gold plating given the relative size of the containers compared to the ones with actual stuff in them. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 20 +++++++++++++++++++- tests/docker/docker.py | 7 ++++++- tests/docker/dockerfiles/empty.docker | 8 ++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/empty.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a5c1e4a615..93b29ad823 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -11,7 +11,7 @@ HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 debian-bootstrap +DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 debian-bootstrap empty DOCKER_IMAGES :=3D $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DI= R)/*.docker)))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -92,6 +92,24 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian= -bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 +# These are test targets +USER_TCG_TARGETS=3D$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(= TARGET_DIRS))) +EXEC_COPY_TESTS=3D$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS= )) + +$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.doc= ker + $(call quiet-command, \ + $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< \ + $(if $V,,--quiet) --no-cache \ + --include-executable=3D$* \ + --skip-binfmt, \ + "TEST","copy $* to container") + $(call quiet-command, \ + $(DOCKER_SCRIPT) run qemu/exec-copy-test-$* \ + /$* -version > tests/docker-exec-copy-test-$*.out, \ + "TEST","check $* works in container") + +docker-exec-copy-test: $(EXEC_COPY_TESTS) + endif =20 # Enforce dependencies for composite images diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 39da3fefcf..d28df4c140 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -438,6 +438,9 @@ class BuildCommand(SubCommand): help=3D"""Specify a binary that will be copied= to the container together with all its dependent libraries""") + parser.add_argument("--skip-binfmt", + action=3D"store_true", + help=3D"""Skip binfmt entry check (used for te= sting)""") parser.add_argument("--extra-files", nargs=3D'*', help=3D"""Specify files that will be copied in= the Docker image, fulfilling the ADD directive fro= m the @@ -466,7 +469,9 @@ class BuildCommand(SubCommand): docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") =20 # Validate binfmt_misc will work - if args.include_executable: + if args.skip_binfmt: + qpath =3D args.include_executable + elif args.include_executable: qpath, enabled =3D _check_binfmt_misc(args.include_executa= ble) if not enabled: return 1 diff --git a/tests/docker/dockerfiles/empty.docker b/tests/docker/dockerfil= es/empty.docker new file mode 100644 index 0000000000..9ba980f1a8 --- /dev/null +++ b/tests/docker/dockerfiles/empty.docker @@ -0,0 +1,8 @@ +# +# Empty Dockerfile +# + +FROM scratch + +# Add everything from the context into the container +ADD . / --=20 2.20.1 From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611339827; cv=none; d=zohomail.com; s=zohoarc; b=EULp57oV3VgMRgRbTjm0eGRI3pGJiLC0aB601H+z053v1nqsffu6lJT9rPRKCVlGhSAqrA1uZW+9efDXHotnfIGuoQ4/CfedqDHHo/I4sZOHI/uLurn8YHeBJgf4OlCjze/v0AUcQ4751gy7DPIEavASjABp7y185BZLFN74XT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611339827; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f6zl2v9LPncQJucBqnlmMhx3Qi+VNlQAjrIpZhJtkg0=; b=MBrKQsk03X2h6oBzRvC7dDe3p/DCIcoX09K5cAtzs0AeMQAYKFXwzY0hqgtBl6f9soQq1Rz8SNM1YRhWZuWoqsvhv0qSLToLw6Z7+IjqvrckOgVrGH7PqyKgCcdRWEB9bz1gtcbFjZjNNa5O3M4tIQSchhS7vcredUL+8Pe9GDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611339827058584.0316950643312; Fri, 22 Jan 2021 10:23:47 -0800 (PST) Received: from localhost ([::1]:46760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3162-00052Q-1l for importer@patchew.org; Fri, 22 Jan 2021 13:23:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311a-0007ak-H9 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:12 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:36744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311Y-0006tg-RV for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:10 -0500 Received: by mail-wr1-x432.google.com with SMTP id 6so5973220wri.3 for ; Fri, 22 Jan 2021 10:19:08 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm13999756wrh.82.2021.01.22.10.18.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 480A61FF93; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f6zl2v9LPncQJucBqnlmMhx3Qi+VNlQAjrIpZhJtkg0=; b=YgWtAWsvMlOXXBRmv8vIr3lvZRL4nUPjpiJWS35NlRmW/vMfw9ljNADhUMcfqZ8wUZ T5ZlVL9VBRuj2zPCWqcr3fhmDL0/kOLp6Ns6PiIZbeZ6AFaanY0uyI7CKF/P4Kbm61VQ LWr8BhM1CAc+EqFASEkwdQMKPvph1WBVq2ODTT5ykLgdKEfANPdMLv/G7nIRfO6Qa2/g mqJm09Bpu5DtsyR9nIdfl95lxlNg+2pxnwF1eiQuh4N6UJRLFMiyMBxPCJa2XBcOn/77 Aju+DyF9oXvcByzmA1fNFktcNxvdtfCQmOllFJ1gyZ5BWQ93dS0Eed/w1FxrhZ32OVqX 99jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f6zl2v9LPncQJucBqnlmMhx3Qi+VNlQAjrIpZhJtkg0=; b=PMetDSy3d14Q3YqvK20vn8SaQJCmc/i4Ih2e8A/gsQWQZUjZDUFjSYrcGhASyRTSek 669dFIQyInCaHbkhd6aAUdZA6AVORPwMfBiBybkgwbKAQYEuJwJ+ws1QfQ/HuFvcYyCR 3FtIQiQhIxtvZHGtZAw1OPCAXRacPrvLufD936HHI5BqUmY1b3I3RIyX0z7WKYzHY1/s SEQxbXp9HDZsi1x97du8EyONpUnDrnOR62pTf4r2fA6QDjiOuv7+cOOVFVw7C1Gh9/FU qrY4SAnRtJM2X2vtIL+pgXWwEzs8zmF2xhpxndrDgnRBw/Sc6Z6IpSG5e2MBOn4bywJQ DUwg== X-Gm-Message-State: AOAM531gX6IhnaM4oZ6Xb+XeCX4+ByuKJhgIpmXIwcYk6WRI1n12zq9g ae/dnCKXIsSrR6s2tld933CFJw== X-Google-Smtp-Source: ABdhPJzdxZE0O9mvwP0UWP4yVzQMNALKekeNKuTb6dUJKThDeCdpidiNxpE6bhlvbOxSXYlGbIK39A== X-Received: by 2002:adf:cd83:: with SMTP id q3mr1878250wrj.225.1611339547462; Fri, 22 Jan 2021 10:19:07 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 7/8] configure: make version_ge more tolerant of shady version input Date: Fri, 22 Jan 2021 18:18:53 +0000 Message-Id: <20210122181854.23105-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When checking GDB versions we have to tolerate all sorts of random distro extensions to the version string. While we already attempt to do some of that before we call version_ge is makes sense to try and regularise the first input by stripping extraneous -'s. While we at it convert the old-style shell quoting into a cleaner form t shut up my editors linter lest it confuse me by underlining the whole line. Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Tested-by: Thomas Huth --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6f6a319c2f..dd99939b34 100755 --- a/configure +++ b/configure @@ -198,8 +198,8 @@ has() { } =20 version_ge () { - local_ver1=3D`echo $1 | tr . ' '` - local_ver2=3D`echo $2 | tr . ' '` + local_ver1=3D$(expr "$1" : '\([0-9.]*\)' | tr . ' ') + local_ver2=3D$(echo "$2" | tr . ' ') while true; do set x $local_ver1 local_first=3D${2-0} --=20 2.20.1 From nobody Mon Feb 9 11:23:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611340098; cv=none; d=zohomail.com; s=zohoarc; b=KmH3I7O1h6w780wKhg3+gS6HUV27DKL/V1NmW+VM3zzCxLT3WTB5yh9jdHL6LwkT07SXV2UfK0p/qFc+nMbvfzbj8I7fpx2Rvcq2gGGntmvNNC18cwkobsIjk7cAiARpgpR1niq6QYEcgcI433Uy/Mn2cu8j8S02zfhigfJeNak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611340098; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dhXKFBqrjyWVwdgcjtJOpFUapsJmdBL8gQLJBNQUd1s=; b=cEaZKYO1X+wRpYFSK7UdeO/hrQJvLEDSe0O+Fe4oUlLokW2eu/vx4p8bZOf9j1P1P3zaYQEgIQ535d2NFLVsIwtyn034F1f8LgavPyT+PGNviRSoJhMD2qD63BiLoaYrJgL2BxnFaX9i/TjGNpUoauGpBg92ZYW1aXGdUVWZKvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611340098289297.47611711823174; Fri, 22 Jan 2021 10:28:18 -0800 (PST) Received: from localhost ([::1]:34630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l31AP-0004P9-5m for importer@patchew.org; Fri, 22 Jan 2021 13:28:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l311b-0007ay-TU for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:12 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:36739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l311W-0006sV-Lh for qemu-devel@nongnu.org; Fri, 22 Jan 2021 13:19:11 -0500 Received: by mail-wr1-x42d.google.com with SMTP id 6so5973109wri.3 for ; Fri, 22 Jan 2021 10:19:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p17sm12237800wmg.46.2021.01.22.10.18.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 10:18:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5C7A61FF96; Fri, 22 Jan 2021 18:18:55 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dhXKFBqrjyWVwdgcjtJOpFUapsJmdBL8gQLJBNQUd1s=; b=aAvto5t5U16jgRTJfZnjrjLXu1/YMAbmGEWoJXj5635Ujan8CoGOFHSZ9iu+iIY1OJ R98BJsjD5cyRjuWRoOT8GVNBuZ7ONh7LRqSDi79ep04Hcds/duTBK9ON31toovq6ya6b 5AhLu8aMCB3vCl7oTvnQqA71x3VcJJgsVg24tgirLIvCVULqP0Ev2ErBNywMz94jCvIZ om83F9jdiSPMv/f/xwOXSgR3TL/okeE2wc7SeDFY4gftXQyrYqg5Wqj5ut5BGHqldvft /hmgRAHh4LNqlHCgd2tTcYa8R6z+p6Cs/Mm6bHAHvREapzM4mX2xYpGWZ9nfeZBNnYwn vRug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dhXKFBqrjyWVwdgcjtJOpFUapsJmdBL8gQLJBNQUd1s=; b=gwVbesfTVwgHvU6pUURyeTNQcm0ohihiG4M+TFNWB+SdK+4pvKtBwobNJPHh8kBJ5V RbVlrwUlS7wKr3/K6tIorrKgYy4efxmlZJvud4pkUlqxm0zksETWrwvVlUTIvWnpqtn8 e1Gl6zzYzExvFP/DlyUTuA/nvq+e0aa+O57hQ1MSsbBEpNRWU2D9/1saKJtLzCMw1j3R UXn6DBZGdT8UUI9u/f5vykKX0SUkB/YLMd4qdCtjNBGpDbSvMXLXJ+pmQ3AXP+rmPWw0 L63e9QT8Y1cW88ABRgwvh6Ox5UCp7jB9iBC0oS9AI1lnyZ4N1g+CFcD3nclmarlDZBuC 5UrA== X-Gm-Message-State: AOAM531RL2TT/mixVFmvbRsNzgYo/aNu5BBRPJzsVU0YBOwwNd8BK6Zz S34znEf1Xdexj4rwpQLwSmw1oA== X-Google-Smtp-Source: ABdhPJysBxdKrhvOYPbUKgxdbckr6v9DX0ZoWHaY4wrULpjfRXZ2Xbm9ZjdwWmhKDcOvxg9uE0W4Ow== X-Received: by 2002:adf:dccb:: with SMTP id x11mr2174415wrm.234.1611339545293; Fri, 22 Jan 2021 10:19:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 8/8] configure: bump the minimum gdb version for check-tcg to 9.1 Date: Fri, 22 Jan 2021 18:18:54 +0000 Message-Id: <20210122181854.23105-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org> References: <20210122181854.23105-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luis Machado , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Claudio Fontana Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) For SVE, currently the bulk of the GDB TCG tests, we need at least GDB 9.1 to support the "ieee_half" data type we report. This only affects when GDB tests are run; users can still use lower versions of gdb as long as they aren't talking to an SVE enabled model. The work around is to either get a newer gdb or disable SVE for their CPU model. Reported-by: Claudio Fontana Cc: Luis Machado Signed-off-by: Alex Benn=C3=A9e --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index dd99939b34..0cf9718d4f 100755 --- a/configure +++ b/configure @@ -6169,7 +6169,7 @@ fi =20 if test -n "$gdb_bin"; then gdb_version=3D$($gdb_bin --version | head -n 1) - if version_ge ${gdb_version##* } 8.3.1; then + if version_ge ${gdb_version##* } 9.1; then echo "HAVE_GDB_BIN=3D$gdb_bin" >> $config_host_mak fi fi --=20 2.20.1