From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E87A6EB64DA for ; Fri, 16 Jun 2023 17:16:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346133AbjFPRQC (ORCPT ); Fri, 16 Jun 2023 13:16:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242470AbjFPRQC (ORCPT ); Fri, 16 Jun 2023 13:16:02 -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 20E9D1BE5; Fri, 16 Jun 2023 10:16:01 -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 AB0DB61B79; Fri, 16 Jun 2023 17:16:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3726EC433C0; Fri, 16 Jun 2023 17:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686935760; bh=0iOv9INgznI/Gr/gLv/vGhX0LLm1LWa930I5lwk7yPU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=k7wtmHLe2/HSMVygz//1M58+3f4L/jgXsUdZUj3WSoX+Abi1J92LTzOIxHomeuha3 d8R9/NS+6UpnxlfHFVuSt8QaVRBjyY/SGGJKU4qhmMlM5jMPCm4ySwXBRyMDPtp6T4 GfvJjbUh7KPvdG6Yfq1PmctbcTnNUwKCYuPFMDp8/N6rva63/sdj7nD9L9q38qFFin KJ3cCKdD3twTlEuyk2CwjtU+DmQ9908Zo6DgP/nUv9RfpmqzdG+IaH7KJqFNgpVJIM ygU6WjShQwKVHYqvuOWpbd4P2kxyU2iQOItsrEcUuhEA5iALxpERPSQNeq9ThwfgnE zGLO41M6Ko65w== Date: Fri, 16 Jun 2023 10:15:57 -0700 From: Nathan Chancellor To: Miguel Ojeda Cc: Masahiro Yamada , Wedson Almeida Filho , Alex Gaynor , Nick Desaulniers , Nicolas Schier , Boqun Feng , Gary Guo , =?iso-8859-1?Q?Bj=F6rn?= Roy Baron , Benno Lossin , Alice Ryhl , Andreas Hindborg , linux-kbuild@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: Re: [PATCH v2 10/11] kbuild: rust_is_available: check that output looks as expected Message-ID: <20230616171557.GI3474164@dev-arch.thelio-3990X> References: <20230616001631.463536-1-ojeda@kernel.org> <20230616001631.463536-11-ojeda@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230616001631.463536-11-ojeda@kernel.org> Precedence: bulk List-ID: X-Mailing-List: rust-for-linux@vger.kernel.org On Fri, Jun 16, 2023 at 02:16:30AM +0200, Miguel Ojeda wrote: > The script already checks for `$RUSTC` and `$BINDGEN` existing > and exiting without failure. However, one may still pass an > unexpected binary that does not output what the later parsing > expects. The script still successfully reports a failure as > expected, but the error is confusing. For instance: > > $ RUSTC=true BINDGEN=bindgen CC=clang scripts/rust_is_available.sh > scripts/rust_is_available.sh: 19: arithmetic expression: expecting primary: "100000 * + 100 * + " > *** > *** Please see Documentation/rust/quick-start.rst for details > *** on how to set up the Rust support. > *** > > Thus add an explicit check and a proper message for unexpected > output from the called command. > > Similarly, do so for the `libclang` version parsing, too. > > Link: https://lore.kernel.org/rust-for-linux/CAK7LNAQYk6s11MASRHW6oxtkqF00EJVqhHOP=5rynWt-QDUsXw@mail.gmail.com/ > Signed-off-by: Miguel Ojeda Reviewed-by: Nathan Chancellor > --- > scripts/rust_is_available.sh | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh > index da8296cd9b8d..117018946b57 100755 > --- a/scripts/rust_is_available.sh > +++ b/scripts/rust_is_available.sh > @@ -97,6 +97,15 @@ rust_compiler_version=$( \ > echo "$rust_compiler_output" \ > | sed -nE '1s:.*rustc ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p' > ) > +if [ -z "$rust_compiler_version" ]; then > + echo >&2 "***" > + echo >&2 "*** Running '$RUSTC' to check the Rust compiler version did not return" > + echo >&2 "*** an expected output. See output and docs below for details:" > + echo >&2 "***" > + echo >&2 "$rust_compiler_output" > + echo >&2 "***" > + exit 1 > +fi > rust_compiler_min_version=$($min_tool_version rustc) > rust_compiler_cversion=$(get_canonical_version $rust_compiler_version) > rust_compiler_min_cversion=$(get_canonical_version $rust_compiler_min_version) > @@ -136,6 +145,15 @@ rust_bindings_generator_version=$( \ > echo "$rust_bindings_generator_output" \ > | sed -nE '1s:.*bindgen ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p' > ) > +if [ -z "$rust_bindings_generator_version" ]; then > + echo >&2 "***" > + echo >&2 "*** Running '$BINDGEN' to check the bindings generator version did not return" > + echo >&2 "*** an expected output. See output and docs below for details:" > + echo >&2 "***" > + echo >&2 "$rust_bindings_generator_output" > + echo >&2 "***" > + exit 1 > +fi > rust_bindings_generator_min_version=$($min_tool_version bindgen) > rust_bindings_generator_cversion=$(get_canonical_version $rust_bindings_generator_version) > rust_bindings_generator_min_cversion=$(get_canonical_version $rust_bindings_generator_min_version) > @@ -184,6 +202,16 @@ bindgen_libclang_version=$( \ > echo "$bindgen_libclang_output" \ > | sed -nE 's:.*clang version ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p' > ) > +if [ -z "$bindgen_libclang_version" ]; then > + echo >&2 "***" > + echo >&2 "*** Running '$BINDGEN' to check the libclang version (used by the Rust" > + echo >&2 "*** bindings generator) did not return an expected output. See output" > + echo >&2 "*** and docs below for details:" > + echo >&2 "***" > + echo >&2 "$bindgen_libclang_output" > + echo >&2 "***" > + exit 1 > +fi > bindgen_libclang_min_version=$($min_tool_version llvm) > bindgen_libclang_cversion=$(get_canonical_version $bindgen_libclang_version) > bindgen_libclang_min_cversion=$(get_canonical_version $bindgen_libclang_min_version) > -- > 2.41.0 >