From patchwork Tue Aug 22 13:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 136556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp3708022vqi; Tue, 22 Aug 2023 08:36:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/73z9nkquLk2NKyMNkqYwPy0ZNPQUk1SKQHMrh0a6MY89Hbj1YaQTTPqPcVt34fBYJyQE X-Received: by 2002:a17:906:2d1:b0:99b:5689:1331 with SMTP id 17-20020a17090602d100b0099b56891331mr9367039ejk.59.1692718603150; Tue, 22 Aug 2023 08:36:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692718603; cv=none; d=google.com; s=arc-20160816; b=H+FHCautGZV8RaboSMUTUkc2rjl+iPArqj9vh+0bfY03pSrKxedU68yEHUpip1i8Iu 5JY5fFJ7t66eShuK5GnH7CEGlWx9XGy+ya6IC2phyTOzb5REREpUytFp9s/f0Zf0/AbE 4FBh6z0LDWucMQPzqz312AHoEfbjURJTYkm2LO0SPuFF+zFhjuVbFYfyFPnNMHDXvNbR QfI76VIMgUEi8HPuWYPqhyohW4siFOOlFppTpr1mcxDK9LLUgiqjnsnT4IYGr7OaoWD3 2tSJl9G6wxz+9Qfe4U3Gw9FvLj2EZOHD8zpX+surFjkfR5m7GDHwp+jGo7HzJZWDitfY lxHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=apwsJHOzlDO5HOyESIq0D/tt9E9OvTrQGwPm15rbbGI=; fh=dARGYcQLG6s+kfu2jLTqgP7bA88IJ13EqGwQVCYqMNw=; b=G6vIPYzqQ9TuQNAMYAVTR3qjee3Pp+Imif1CWtc5vVxQ35qh6XWN1kakS8xoYgdaBd msPxWtxWvVoktwWpEarklFMu3lpNZCdUH+aUzEiJ8GYgtJi4ivqIklPZv7DlgkMbBoh+ weqEfslazozuw4EYGO5FD6wX6Pv0cpa8GdEmKCA6Ug8eF0bNuGgr0gJZw18DYZrSDF7h 17rmdmKFVwTQdhfXWT02ABZ11/VgjTuqi9kfq1JqtsljXWjihsOfd29x3eSkOFwS/bby 1cJMEEPLPkvliEvLQT3htQtmEkmJ81uD1I+Cyb1Ml/DcXVyFdCdnXUc2lN3CCwcm6fEQ PfHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z4WPe1gs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv24-20020a170906b1d800b0099d55a9605dsi7971376ejb.267.2023.08.22.08.36.19; Tue, 22 Aug 2023 08:36:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z4WPe1gs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236191AbjHVN6q (ORCPT + 99 others); Tue, 22 Aug 2023 09:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233421AbjHVN6q (ORCPT ); Tue, 22 Aug 2023 09:58:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E4B61B2; Tue, 22 Aug 2023 06:58:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F2AF06574E; Tue, 22 Aug 2023 13:58:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9BBAC433C7; Tue, 22 Aug 2023 13:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692712723; bh=B6tuRrgtGwA0ObKW3bBPsxHlaa4WJhLQYNJCAXb4G3k=; h=From:To:Cc:Subject:Date:From; b=Z4WPe1gs3kGTXUTXQ4c9FhqAO4seP+gWMKw+YudQbTTBGuoZwETQW08UOZujk+RK/ 015adPhyv8KqlQjMYKqpSuFWuuruCdZ29147L+bKClPO+mwzggp8L2JvwcbvuE8XF6 Ky/+hvZkmiP38BdaF1amER7CsXpBF2llMzOHTxQNFGCTI21e/872FBm5iYseH4zlOy Z6+leGWyDEJkPJiA3F+re6psBrYq24dfZ8fWKh+7p8785Pi2LXzWLZvMl9yADuiEKo CevnzOCDenypavD851IeA2oP/M6Mb+UHvCPxlUvFcwML0Ejtn7O7bb5xVGk5DvZSym 3eDSALKyS+E5w== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Benjamin Poirier , Jonathan Toppins Subject: [PATCH] selftests: Keep symlinks, when possible Date: Tue, 22 Aug 2023 15:58:37 +0200 Message-Id: <20230822135837.280967-1-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774944101759780567 X-GMAIL-MSGID: 1774944101759780567 From: Björn Töpel When kselftest is built/installed with the 'gen_tar' target, rsync is used for the installation step to copy files. Extra care is needed for tests that have symlinks. Commit ae108c48b5d2 ("selftests: net: Fix cross-tree inclusion of scripts") added '-L' (transform symlink into referent file/dir) to rsync, to fix dangling links. However, that broke some tests where the symlink (being a symlink) is part of the test (e.g. exec:execveat). Use rsync's '--copy-unsafe-links' that does right thing. Fixes: ae108c48b5d2 ("selftests: net: Fix cross-tree inclusion of scripts") Signed-off-by: Björn Töpel --- tools/testing/selftests/lib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: f7757129e3dea336c407551c98f50057c22bb266 diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index d17854285f2b..118e0964bda9 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -106,7 +106,7 @@ endef run_tests: all ifdef building_out_of_srctree @if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \ - rsync -aLq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \ + rsync -aq --copy-unsafe-links $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \ fi @if [ "X$(TEST_PROGS)" != "X" ]; then \ $(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \ @@ -120,7 +120,7 @@ endif define INSTALL_SINGLE_RULE $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)) - $(if $(INSTALL_LIST),rsync -aL $(INSTALL_LIST) $(INSTALL_PATH)/) + $(if $(INSTALL_LIST),rsync -a --copy-unsafe-links $(INSTALL_LIST) $(INSTALL_PATH)/) endef define INSTALL_RULE