From patchwork Tue Oct 4 13:01:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 612268 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp205109pvb; Tue, 4 Oct 2022 07:16:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4so4bf/lh38Vg0QmxNRYoiSCRub7C4IW0bYVujLmhYNQrWQPr/lLssKYSDZ8XS655kEK5Y X-Received: by 2002:a05:622a:96:b0:35d:43a2:601b with SMTP id o22-20020a05622a009600b0035d43a2601bmr19743961qtw.423.1664893008719; Tue, 04 Oct 2022 07:16:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664893008; cv=none; d=google.com; s=arc-20160816; b=b6VJKBUMxCNbQo3xy4X0rgk1BNtSdEWuLXCY/kUzCJk2tuiZW9JEzNdS4L+sc6aaDV w2kP9Y0/rsWDTvThA7eh5DiZ5o6CMSVnepQEjNOk3rBgMw5BR2mkdOuy51gyVmfLVNoZ bLnLY+1IEAVSQ361vL0pXq4kUTzoX3rK6ApNwYp1cQXH5DeYh+zch8U2MyEO/fLaQmWp BrpzW7BVAhShiXKZgnpFM4s6NMTI2UZ1ObbZxzJiJVpXlJdfZnrh7YxTqTehLjRPtoOK vLbDcLRm4gKRqi4iMPA1ujiQAoQOFEHaMT14cbbgDj8Q+gt66ApDSQ3905zz9T/A49Xr r8eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YfuwARZoVOH5mYGRHlBCDKxwrAb3kVRqcznzJXbhhCE=; b=uVag+urVCSqysAKPea4IMC16q8JiJDDga5dA5PkpBdm+krqgKF67PCFasnKREYxr6T PG1kaat62PARe0JYTLe75eRJ/MNKtBwM7N0MFf1qWaLOXXL5v4chFVt3vdq/ex0P3Oqa XqW7NfTaoUpeeHvPdpygALVzpyiaqsySHLv2kc8SEuqgs6nz4bJm844EivnirdIKwSub M9ObHXEba7HWB8lTSWfKGWouaJppngGpfuiopJtsx9OVZheDGLKyNUFq4s4W0S4mq2Ne Nqq1VGutn+hKmClGrvMs7rvvFhslmTULOHlVL/UmbzQPDhdST/3n7sY6asAA+a2sAPE1 J7qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yqrRh5xQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y16-20020a05620a25d000b006bb29b76047si4520158qko.644.2022.10.04.07.16.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Oct 2022 07:16:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yqrRh5xQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofij2-0008Ua-3H for patch@linaro.org; Tue, 04 Oct 2022 10:16:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofi9L-0001cg-22 for qemu-devel@nongnu.org; Tue, 04 Oct 2022 09:39:55 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39785) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ofi9J-00023a-7e for qemu-devel@nongnu.org; Tue, 04 Oct 2022 09:39:54 -0400 Received: by mail-wr1-x42c.google.com with SMTP id f11so18727072wrm.6 for ; Tue, 04 Oct 2022 06:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=YfuwARZoVOH5mYGRHlBCDKxwrAb3kVRqcznzJXbhhCE=; b=yqrRh5xQnRgFUtAUW8Y+XqonaxFK7XtmhaYUWqsO3MpO+s0BOWeKI0lIlPQD6RMD5d RVc+Cr3QilQwPd+iNMiic8rYAu2iVjE4dI8HNLXDOG+zlEkALbfuRA2UnQNjVxthEvay hvpF4ZJGBmfpoXinEDZPT84wQqU1W2uDXv3O2ArCN0CbotqPVykr1rblg+3hu65dvWVv FAOpf5a3CkuJJaQO/rypkQgOe92FypfTvGrMZnxoRqvvVXnVeOeZ/ARfj4Xq7CgWdFtx LsPkVCM2RHBgs5tGDU5rCEkFwoFPlQr4AcYQQ2mJ9nmSfFwRoC9UALy1LBB5Tu9JmTs3 YPKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=YfuwARZoVOH5mYGRHlBCDKxwrAb3kVRqcznzJXbhhCE=; b=eQozTvoOX+Y5DkJomTEBIG1pVYjVFVmgj1LoREJIWRAFKIJAgnPpfD9QvhdCP0xmji OQd1lnoUQG1+++fNhbcRrN4hmW8rJnsLUmbifPqLhSiuRZwE4DMpdHzmECGgbHSWeVIA pUgwM879MViXqOG0IRnGPbLRkZ52r4PpekUZ1y/pZhQ+c5AJ+KigG+xfGGyIpLOTkCNV dyUwi4T0Ed3ppFaHV/xoMOX0aVqeA73nXmRJfYg/p9L9B3J5XtiVJPQZFYgrG2kuCcKy 1iWIOCRgSfAjUMlvUORxy4IBPcuq6hnGmkGb2oWMPOrkuqJBoF02SkD1iyEns+VD+Ace V56w== X-Gm-Message-State: ACrzQf0rMloLu+hdPR7/CQUtdYf2IiVhdSrmbtaTJoyYNdys1HpMxmJL IW67XDpJcIDbX8jL0rtu14xoFw== X-Received: by 2002:a5d:5a0d:0:b0:228:da3f:738 with SMTP id bq13-20020a5d5a0d000000b00228da3f0738mr16379642wrb.526.1664890791679; Tue, 04 Oct 2022 06:39:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l7-20020a05600c4f0700b003b4c979e6bcsm20350036wmq.10.2022.10.04.06.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 06:39:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 70DAE1FFBB; Tue, 4 Oct 2022 14:01:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Paolo Bonzini , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= Subject: [PULL 27/54] configure: cleanup creation of tests/tcg target config Date: Tue, 4 Oct 2022 14:01:11 +0100 Message-Id: <20221004130138.2299307-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221004130138.2299307-1-alex.bennee@linaro.org> References: <20221004130138.2299307-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Remove the symlink to tests/tcg/config-*.mak, which is possible now that unused target config files are not created either. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20220929114231.583801-28-alex.bennee@linaro.org> diff --git a/configure b/configure index 8b495d4453..c175650eb9 100755 --- a/configure +++ b/configure @@ -2540,10 +2540,6 @@ tcg_tests_targets= for target in $target_list; do arch=${target%%-*} - config_target_mak=tests/tcg/config-$target.mak - - echo "# Automatically generated by configure - do not modify" > $config_target_mak - echo "TARGET_NAME=$arch" >> "$config_target_mak" case $target in xtensa*-linux-user) # the toolchain is not complete with headers, only build softmmu tests @@ -2560,13 +2556,15 @@ for target in $target_list; do if probe_target_compiler $target || test -n "$container_image"; then test -n "$container_image" && build_static=y - write_target_makefile "build-tcg-tests-$target >> "$config_target_mak" mkdir -p "tests/tcg/$target" + config_target_mak=tests/tcg/$target/config-target.mak ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/Makefile" - ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak" + echo "# Automatically generated by configure - do not modify" > "$config_target_mak" + echo "TARGET_NAME=$arch" >> "$config_target_mak" echo "TARGET=$target" >> "$config_target_mak" - echo "QEMU=$PWD/$qemu" >> "$config_target_mak" + write_target_makefile "build-tcg-tests-$target" >> "$config_target_mak" echo "BUILD_STATIC=$build_static" >> "$config_target_mak" + echo "QEMU=$PWD/$qemu" >> "$config_target_mak" echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs tcg_tests_targets="$tcg_tests_targets $target" fi diff --git a/Makefile b/Makefile index 357592ad39..a48103cc8a 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,7 @@ qemu-%.tar.bz2: distclean: clean recurse-distclean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : rm -f config-host.mak Makefile.prereqs qemu-bundle - rm -f tests/tcg/config-*.mak + rm -f tests/tcg/*/config-target.mak tests/tcg/config-host.mak rm -f config.status rm -f roms/seabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols diff --git a/meson.build b/meson.build index 8dc661363f..ac5ef05c21 100644 --- a/meson.build +++ b/meson.build @@ -3738,7 +3738,7 @@ summary(summary_info, bool_yn: true, section: 'Compilation') summary_info = {} have_cross = false foreach target: target_dirs - tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak' + tcg_mak = meson.current_build_dir() / 'tests/tcg' / target / 'config-target.mak' if fs.exists(tcg_mak) config_cross_tcg = keyval.load(tcg_mak) if 'CC' in config_cross_tcg