Auto merge of #112482 - tgross35:ci-non-rust-linters, r=pietroalbini

Add support for tidy linting via external tools for non-rust files This change adds the flag `--check-extras` to `tidy`. It accepts a comma separated list of any of the options: * py (test everything applicable for python files) * py:lint (lint python files using `ruff`) * py:fmt (check formatting for python files using `black`) * shell or shell:lint (lint shell files using `shellcheck`) Specific files to check can also be specified via positional args. Examples: * `./x test tidy --check-extras=shell,py` * `./x test tidy --check-extras=py:fmt -- src/bootstrap/bootstrap.py` * `./x test tidy --check-extras=shell -- src/ci/*.sh` * Python formatting can be applied with bless: `./x test tidy --ckeck-extras=py:fmt --bless` `ruff` and `black` need to be installed via pip; this tool manages these within a virtual environment at `build/venv`. `shellcheck` needs to be installed on the system already. --- This PR doesn't fix any of the errors that show up (I will likely go through those at some point) and it doesn't enforce anything new in CI. Relevant zulip discussion: https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Other.20linters.20in.20CI

Author: bors

src/bootstrap/bootstrap.py

@@ -472,7 +472,9 @@ def __init__(self):
 
 class RustBuild(object):
  """Provide all the methods required to build Rust"""
- def __init__(self, config_toml="", args=FakeArgs()):
+ def __init__(self, config_toml="", args=None):
+ if args is None:
+ args = FakeArgs()
  self.git_version = None
  self.nix_deps_dir = None
  self._should_fix_bins_and_dylibs = None

src/bootstrap/bootstrap_test.py

@@ -4,7 +4,6 @@
 
 from __future__ import absolute_import, division, print_function
 import os
-import doctest
 import unittest
 import tempfile
 import hashlib
@@ -16,12 +15,15 @@
 bootstrap_dir = os.path.dirname(os.path.abspath(__file__))
 # For the import below, have Python search in src/bootstrap first.
 sys.path.insert(0, bootstrap_dir)
-import bootstrap
-import configure
+import bootstrap # noqa: E402
+import configure # noqa: E402
 
-def serialize_and_parse(configure_args, bootstrap_args=bootstrap.FakeArgs()):
+def serialize_and_parse(configure_args, bootstrap_args=None):
  from io import StringIO
 
+ if bootstrap_args is None:
+ bootstrap_args = bootstrap.FakeArgs()
+
  section_order, sections, targets = configure.parse_args(configure_args)
  buffer = StringIO()
  configure.write_config_toml(buffer, section_order, targets, sections)
@@ -129,7 +131,14 @@ def test_set_codegen_backends(self):
 class BuildBootstrap(unittest.TestCase):
  """Test that we generate the appropriate arguments when building bootstrap"""
 
- def build_args(self, configure_args=[], args=[], env={}):
+ def build_args(self, configure_args=None, args=None, env=None):
+ if configure_args is None:
+ configure_args = []
+ if args is None:
+ args = []
+ if env is None:
+ env = {}
+
  env = env.copy()
  env["PATH"] = os.environ["PATH"]
 

src/bootstrap/builder/tests.rs

@@ -587,6 +587,7 @@ mod dist {
  run: None,
  only_modified: false,
  skip: vec![],
+ extra_checks: None,
  };
 
  let build = Build::new(config);
@@ -658,6 +659,7 @@ mod dist {
  pass: None,
  run: None,
  only_modified: false,
+ extra_checks: None,
  };
  // Make sure rustfmt binary not being found isn't an error.
  config.channel = "beta".to_string();

src/bootstrap/flags.rs

@@ -339,6 +339,10 @@ pub enum Subcommand {
  /// whether to automatically update stderr/stdout files
  bless: bool,
  #[arg(long)]
+ /// comma-separated list of other files types to check (accepts py, py:lint,
+ /// py:fmt, shell)
+ extra_checks: Option<String>,
+ #[arg(long)]
  /// rerun tests even if the inputs are unchanged
  force_rerun: bool,
  #[arg(long)]
@@ -476,6 +480,13 @@ impl Subcommand {
  }
  }
 
+ pub fn extra_checks(&self) -> Option<&str> {
+ match *self {
+ Subcommand::Test { ref extra_checks, .. } => extra_checks.as_ref().map(String::as_str),
+ _ => None,
+ }
+ }
+
  pub fn only_modified(&self) -> bool {
  match *self {
  Subcommand::Test { only_modified, .. } => only_modified,

src/bootstrap/test.rs

@@ -4,6 +4,7 @@
 //! our CI.
 
 use std::env;
+use std::ffi::OsStr;
 use std::ffi::OsString;
 use std::fs;
 use std::iter;
@@ -1094,6 +1095,14 @@ impl Step for Tidy {
  if builder.config.cmd.bless() {
  cmd.arg("--bless");
  }
+ if let Some(s) = builder.config.cmd.extra_checks() {
+ cmd.arg(format!("--extra-checks={s}"));
+ }
+ let mut args = std::env::args_os();
+ if let Some(_) = args.find(|arg| arg == OsStr::new("--")) {
+ cmd.arg("--");
+ cmd.args(args);
+ }
 
  if builder.config.channel == "dev" || builder.config.channel == "nightly" {
  builder.info("fmt check");

src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile

@@ -26,11 +26,13 @@ COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
-RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt
+RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt \
+ && pip3 install virtualenv
 
 COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
 COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
 
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
-ENV SCRIPT python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest
+ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
+ --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint

src/ci/docker/scripts/fuchsia-test-runner.py

@@ -15,12 +15,10 @@
 import json
 import os
 import platform
-import re
 import shutil
-import signal
 import subprocess
 import sys
-from typing import ClassVar, List, Optional
+from typing import ClassVar, List
 
 
 @dataclass
@@ -523,7 +521,7 @@ def log(msg):
  env_vars += '\n "RUST_BACKTRACE=0",'
 
  # Use /tmp as the test temporary directory
- env_vars += f'\n "RUST_TEST_TMPDIR=/tmp",'
+ env_vars += '\n "RUST_TEST_TMPDIR=/tmp",'
 
  cml.write(
  self.CML_TEMPLATE.format(env_vars=env_vars, exe_name=exe_name)

src/etc/completions/x.py.fish

@@ -234,6 +234,7 @@ complete -c x.py -n "__fish_seen_subcommand_from doc" -s h -l help -d 'Print hel
 complete -c x.py -n "__fish_seen_subcommand_from test" -l skip -d 'skips tests matching SUBSTRING, if supported by test tool. May be passed multiple times' -r -F
 complete -c x.py -n "__fish_seen_subcommand_from test" -l test-args -d 'extra arguments to be passed for the test tool being used (e.g. libtest, compiletest or rustdoc)' -r
 complete -c x.py -n "__fish_seen_subcommand_from test" -l rustc-args -d 'extra options to pass the compiler when running tests' -r
+complete -c x.py -n "__fish_seen_subcommand_from test" -l extra-checks -d 'comma-separated list of other files types to check (accepts py, py:lint, py:fmt, shell)' -r
 complete -c x.py -n "__fish_seen_subcommand_from test" -l compare-mode -d 'mode describing what file the actual ui output will be compared to' -r
 complete -c x.py -n "__fish_seen_subcommand_from test" -l pass -d 'force {check,build,run}-pass tests to this mode' -r
 complete -c x.py -n "__fish_seen_subcommand_from test" -l run -d 'whether to execute run-* tests' -r

src/etc/completions/x.py.ps1

@@ -306,6 +306,7 @@ Register-ArgumentCompleter -Native -CommandName 'x.py' -ScriptBlock {
  [CompletionResult]::new('--skip', 'skip', [CompletionResultType]::ParameterName, 'skips tests matching SUBSTRING, if supported by test tool. May be passed multiple times')
  [CompletionResult]::new('--test-args', 'test-args', [CompletionResultType]::ParameterName, 'extra arguments to be passed for the test tool being used (e.g. libtest, compiletest or rustdoc)')
  [CompletionResult]::new('--rustc-args', 'rustc-args', [CompletionResultType]::ParameterName, 'extra options to pass the compiler when running tests')
+ [CompletionResult]::new('--extra-checks', 'extra-checks', [CompletionResultType]::ParameterName, 'comma-separated list of other files types to check (accepts py, py:lint, py:fmt, shell)')
  [CompletionResult]::new('--compare-mode', 'compare-mode', [CompletionResultType]::ParameterName, 'mode describing what file the actual ui output will be compared to')
  [CompletionResult]::new('--pass', 'pass', [CompletionResultType]::ParameterName, 'force {check,build,run}-pass tests to this mode')
  [CompletionResult]::new('--run', 'run', [CompletionResultType]::ParameterName, 'whether to execute run-* tests')

src/etc/completions/x.py.sh

@@ -1625,7 +1625,7 @@ _x.py() {
  return 0
  ;;
  x.py__test)
- opts="-v -i -j -h --no-fail-fast --skip --test-args --rustc-args --no-doc --doc --bless --force-rerun --only-modified --compare-mode --pass --run --rustfix-coverage --verbose --incremental --config --build-dir --build --host --target --exclude --include-default-paths --rustc-error-format --on-fail --dry-run --stage --keep-stage --keep-stage-std --src --jobs --warnings --error-format --json-output --color --llvm-skip-rebuild --rust-profile-generate --rust-profile-use --llvm-profile-use --llvm-profile-generate --reproducible-artifact --set --help [PATHS]... [ARGS]..."
+ opts="-v -i -j -h --no-fail-fast --skip --test-args --rustc-args --no-doc --doc --bless --extra-checks --force-rerun --only-modified --compare-mode --pass --run --rustfix-coverage --verbose --incremental --config --build-dir --build --host --target --exclude --include-default-paths --rustc-error-format --on-fail --dry-run --stage --keep-stage --keep-stage-std --src --jobs --warnings --error-format --json-output --color --llvm-skip-rebuild --rust-profile-generate --rust-profile-use --llvm-profile-use --llvm-profile-generate --reproducible-artifact --set --help [PATHS]... [ARGS]..."
  if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
  COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
  return 0
@@ -1643,6 +1643,10 @@ _x.py() {
  COMPREPLY=($(compgen -f "${cur}"))
  return 0
  ;;
+ --extra-checks)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
  --compare-mode)
  COMPREPLY=($(compgen -f "${cur}"))
  return 0