Skip to content

Commit fa2b95c

Browse files
author
MarcoFalke
committed
test: Remove all-lint.py script
1 parent fadb06c commit fa2b95c

File tree

3 files changed

+24
-43
lines changed

3 files changed

+24
-43
lines changed

test/lint/README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ result is cached and it prevents issues when the image changes.
1616
test runner
1717
===========
1818

19-
To run the checks in the test runner outside the docker, use:
19+
To run all the lint checks in the test runner outside the docker, use:
2020

2121
```sh
2222
( cd ./test/lint/test_runner/ && cargo fmt && cargo clippy && cargo run )
@@ -46,12 +46,6 @@ Individual tests can be run by directly calling the test script, e.g.:
4646
test/lint/lint-files.py
4747
```
4848

49-
You can run all the shell-based lint tests by running:
50-
51-
```
52-
test/lint/all-lint.py
53-
```
54-
5549
check-doc.py
5650
============
5751
Check for missing documentation of command line options.
@@ -89,7 +83,3 @@ To do so, add the upstream repository as remote:
8983
```
9084
git remote add --fetch secp256k1 https://github.com/bitcoin-core/secp256k1.git
9185
```
92-
93-
all-lint.py
94-
===========
95-
Calls other scripts with the `lint-` prefix.

test/lint/all-lint.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

test/lint/test_runner/src/main.rs

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// file COPYING or https://opensource.org/license/mit/.
44

55
use std::env;
6+
use std::fs;
67
use std::path::PathBuf;
78
use std::process::Command;
89
use std::process::ExitCode;
@@ -29,8 +30,8 @@ fn check_output(cmd: &mut std::process::Command) -> Result<String, LintError> {
2930
}
3031

3132
/// Return the git root as utf8, or panic
32-
fn get_git_root() -> String {
33-
check_output(git().args(["rev-parse", "--show-toplevel"])).unwrap()
33+
fn get_git_root() -> PathBuf {
34+
PathBuf::from(check_output(git().args(["rev-parse", "--show-toplevel"])).unwrap())
3435
}
3536

3637
fn lint_subtree() -> LintResult {
@@ -94,11 +95,24 @@ fn lint_doc() -> LintResult {
9495
}
9596

9697
fn lint_all() -> LintResult {
97-
if Command::new("test/lint/all-lint.py")
98-
.status()
99-
.expect("command error")
100-
.success()
101-
{
98+
let mut good = true;
99+
let lint_dir = get_git_root().join("test/lint");
100+
for entry in fs::read_dir(lint_dir).unwrap() {
101+
let entry = entry.unwrap();
102+
let entry_fn = entry.file_name().into_string().unwrap();
103+
if entry_fn.starts_with("lint-")
104+
&& entry_fn.ends_with(".py")
105+
&& !Command::new("python3")
106+
.arg(entry.path())
107+
.status()
108+
.expect("command error")
109+
.success()
110+
{
111+
good = false;
112+
println!("^---- failure generated from {}", entry_fn);
113+
}
114+
}
115+
if good {
102116
Ok(())
103117
} else {
104118
Err("".to_string())
@@ -110,10 +124,10 @@ fn main() -> ExitCode {
110124
("subtree check", lint_subtree),
111125
("std::filesystem check", lint_std_filesystem),
112126
("-help=1 documentation check", lint_doc),
113-
("all-lint.py script", lint_all),
127+
("lint-*.py scripts", lint_all),
114128
];
115129

116-
let git_root = PathBuf::from(get_git_root());
130+
let git_root = get_git_root();
117131

118132
let mut test_failed = false;
119133
for (lint_name, lint_fn) in test_list {

0 commit comments

Comments
 (0)