mirror of
https://github.com/sharkdp/hyperfine.git
synced 2026-11-15 17:01:26 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6abc025bc |
No files matched your search
@@ -18,7 +18,7 @@ jobs:
|
||||
name: Extract crate metadata
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v4
|
||||
- name: Extract crate information
|
||||
id: crate_metadata
|
||||
run: |
|
||||
@@ -49,7 +49,7 @@ jobs:
|
||||
- uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
components: rustfmt
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v4
|
||||
- run: cargo fmt -- --check
|
||||
|
||||
min_version:
|
||||
@@ -58,7 +58,7 @@ jobs:
|
||||
needs: crate_metadata
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install rust toolchain (v${{ needs.crate_metadata.outputs.msrv }})
|
||||
uses: dtolnay/rust-toolchain@master
|
||||
@@ -94,7 +94,7 @@ jobs:
|
||||
BUILD_CMD: cargo
|
||||
steps:
|
||||
- name: Checkout source code
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install prerequisites
|
||||
shell: bash
|
||||
|
||||
@@ -1,20 +1,3 @@
|
||||
# v1.20.0
|
||||
|
||||
## Features
|
||||
|
||||
- Add `--reference-name` option to give a meaningful name to the reference command, see #808 (@niklasdewally)
|
||||
- The `--ignore-failure` option now supports a comma-separated list of exit codes to ignore (e.g., `--ignore-failure=1,2`), see #836 (@sharkdp)
|
||||
- Python scripts: Add `--time-unit` option to `advanced_statistics.py` (@sharkdp)
|
||||
- Python scripts: Add new `plot_benchmarks.py` script for plotting collections of benchmarks, see #806 (@marxin)
|
||||
|
||||
## Bugfixes
|
||||
|
||||
- Fix bug where naming individual commands with parameter scan was not working correctly, see #794 (@teofr)
|
||||
|
||||
## Other
|
||||
|
||||
- Restrict `cat` tests to Unix environments, see #776 and #777 (@ritvikos)
|
||||
|
||||
# v1.19.0
|
||||
|
||||
## Features
|
||||
|
||||
+2
-2
@@ -13,5 +13,5 @@ authors:
|
||||
repository-code: 'https://github.com/sharkdp/hyperfine'
|
||||
abstract: A command-line benchmarking tool.
|
||||
license: MIT
|
||||
version: 1.20.0
|
||||
date-released: '2025-11-18'
|
||||
version: 1.16.1
|
||||
date-released: '2023-03-21'
|
||||
Generated
+481
-446
File diff suppressed because it is too large.
Load diff
+15
-16
@@ -7,26 +7,25 @@ license = "MIT OR Apache-2.0"
|
||||
name = "hyperfine"
|
||||
readme = "README.md"
|
||||
repository = "https://github.com/sharkdp/hyperfine"
|
||||
version = "1.20.0"
|
||||
version = "1.19.0"
|
||||
edition = "2018"
|
||||
build = "build.rs"
|
||||
rust-version = "1.97.0"
|
||||
rust-version = "1.88.0"
|
||||
|
||||
[features]
|
||||
# Use the nightly feature windows_process_extensions_main_thread_handle
|
||||
windows_process_extensions_main_thread_handle = []
|
||||
|
||||
[dependencies]
|
||||
colored = "3.1"
|
||||
# Newer versions regress ETA estimates: https://github.com/console-rs/indicatif/issues/580
|
||||
colored = "2.1"
|
||||
indicatif = "=0.17.4"
|
||||
statistical = "1.0"
|
||||
csv = "1.4"
|
||||
csv = "1.3"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
rust_decimal = "1.43"
|
||||
rand = "0.10"
|
||||
shell-words = "1.1"
|
||||
rust_decimal = "1.36"
|
||||
rand = "0.8"
|
||||
shell-words = "1.0"
|
||||
thiserror = "2.0"
|
||||
anyhow = "1.0"
|
||||
|
||||
@@ -34,7 +33,7 @@ anyhow = "1.0"
|
||||
libc = "0.2"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
windows-sys = { version = "0.61", features = [
|
||||
windows-sys = { version = "0.59", features = [
|
||||
"Win32_Foundation",
|
||||
"Win32_Security",
|
||||
"Win32_System_JobObjects",
|
||||
@@ -43,10 +42,10 @@ windows-sys = { version = "0.61", features = [
|
||||
] }
|
||||
|
||||
[target.'cfg(all(windows, not(windows_process_extensions_main_thread_handle)))'.dependencies]
|
||||
once_cell = "1.21"
|
||||
once_cell = "1.19"
|
||||
|
||||
[target.'cfg(target_os="linux")'.dependencies]
|
||||
nix = { version = "0.31", features = ["zerocopy"] }
|
||||
nix = { version = "0.29", features = ["zerocopy"] }
|
||||
|
||||
[dependencies.clap]
|
||||
version = "4"
|
||||
@@ -63,18 +62,18 @@ features = [
|
||||
|
||||
[dev-dependencies]
|
||||
approx = "0.5"
|
||||
assert_cmd = "2.2"
|
||||
insta = { version = "1.48", features = ["yaml"] }
|
||||
assert_cmd = "2.0"
|
||||
insta = { version = "1.41.1", features = ["yaml"] }
|
||||
predicates = "3.1"
|
||||
tempfile = "3.27"
|
||||
tempfile = "3.14"
|
||||
|
||||
[profile.dev.package]
|
||||
insta.opt-level = 3
|
||||
similar.opt-level = 3
|
||||
|
||||
[build-dependencies]
|
||||
clap = "4.6"
|
||||
clap_complete = "4.6"
|
||||
clap = "4.5.47"
|
||||
clap_complete = "4.2.1"
|
||||
|
||||
[profile.release]
|
||||
lto = true
|
||||
|
||||
@@ -10,6 +10,18 @@ A command-line benchmarking tool.
|
||||
|
||||

|
||||
|
||||
### Sponsors
|
||||
|
||||
A special *thank you* goes to our biggest <a href="doc/sponsors.md">sponsor</a>:<br>
|
||||
|
||||
<a href="https://www.warp.dev/hyperfine">
|
||||
<img src="doc/sponsors/warp-logo.png" width="200" alt="Warp">
|
||||
<br>
|
||||
<strong>Warp, the intelligent terminal</strong>
|
||||
<br>
|
||||
<sub>Available on MacOS, Linux, Windows</sub>
|
||||
</a>
|
||||
|
||||
## Features
|
||||
|
||||
* Statistical analysis across multiple runs.
|
||||
@@ -108,7 +120,7 @@ hyperfine -N 'grep TODO /home/user'
|
||||
```
|
||||
|
||||
|
||||
### Shell functions
|
||||
### Shell functions and aliases
|
||||
|
||||
If you are using bash, you can export shell functions to directly benchmark them with hyperfine:
|
||||
|
||||
@@ -118,10 +130,13 @@ export -f my_function
|
||||
hyperfine --shell=bash my_function
|
||||
```
|
||||
|
||||
Otherwise, inline the function into the benchmarked command:
|
||||
Otherwise, inline them into or source them from the benchmarked program:
|
||||
|
||||
```sh
|
||||
hyperfine 'my_function() { sleep 1; }; my_function'
|
||||
|
||||
echo 'alias my_alias="sleep 1"' > /tmp/my_alias.sh
|
||||
hyperfine '. /tmp/my_alias.sh; my_alias'
|
||||
```
|
||||
|
||||
### Exporting results
|
||||
@@ -164,15 +179,11 @@ like `--warmup`, `--prepare <cmd>`, `--setup <cmd>` or `--cleanup <cmd>`:
|
||||
|
||||
### On Ubuntu
|
||||
|
||||
On Ubuntu, hyperfine can be installed [from the official repositories](https://launchpad.net/ubuntu/+source/rust-hyperfine):
|
||||
Download the appropriate `.deb` package from the [Release page](https://github.com/sharkdp/hyperfine/releases)
|
||||
and install it via `dpkg`:
|
||||
```
|
||||
apt install hyperfine
|
||||
```
|
||||
|
||||
Alternatively, for the latest version, you can download the appropriate `.deb` package from the [Release page](https://github.com/sharkdp/hyperfine/releases) and install it via `dpkg`:
|
||||
```
|
||||
wget https://github.com/sharkdp/hyperfine/releases/download/v1.20.0/hyperfine_1.20.0_amd64.deb
|
||||
sudo dpkg -i hyperfine_1.20.0_amd64.deb
|
||||
wget https://github.com/sharkdp/hyperfine/releases/download/v1.19.0/hyperfine_1.19.0_amd64.deb
|
||||
sudo dpkg -i hyperfine_1.19.0_amd64.deb
|
||||
```
|
||||
|
||||
### On Fedora
|
||||
@@ -199,7 +210,7 @@ pacman -S hyperfine
|
||||
|
||||
### On Debian Linux
|
||||
|
||||
On Debian Linux, hyperfine can be installed [from the official repositories](https://packages.debian.org/hyperfine):
|
||||
On Debian Linux, hyperfine can be installed [from the testing repositories](https://packages.debian.org/testing/main/hyperfine):
|
||||
```
|
||||
apt install hyperfine
|
||||
```
|
||||
@@ -302,7 +313,7 @@ Hyperfine can be installed from source via [cargo](https://doc.rust-lang.org/car
|
||||
cargo install --locked hyperfine
|
||||
```
|
||||
|
||||
Make sure that you use Rust 1.97 or newer.
|
||||
Make sure that you use Rust 1.76 or newer.
|
||||
|
||||
### From binaries (Linux, macOS, Windows)
|
||||
|
||||
|
||||
+1
-1
@@ -131,7 +131,7 @@ Execute \fICMD\fP after the completion of all benchmarking runs for each individ
|
||||
command to be benchmarked. This is useful if the commands to be benchmarked
|
||||
produce artifacts that need to be cleaned up. It only runs once a series of
|
||||
benchmark runs, as opposed to \fB\-\-conclude\fR option which runs after
|
||||
every run.
|
||||
ever run.
|
||||
.HP
|
||||
\fB\-P\fR, \fB\-\-parameter\-scan\fR \fIVAR\fP \fIMIN\fP \fIMAX\fP
|
||||
.IP
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
## Sponsors
|
||||
|
||||
`hyperfine` development is sponsored by many individuals and companies. Thank you very much!
|
||||
|
||||
Please note, that being sponsored does not affect the individuality of the `hyperfine`
|
||||
project or affect the maintainers' actions in any way.
|
||||
We remain impartial and continue to assess pull requests solely on merit - the
|
||||
features added, bugs solved, and effect on the overall complexity of the code.
|
||||
No issue will have a different priority based on sponsorship status of the
|
||||
reporter.
|
||||
|
||||
Contributions from anybody are most welcomed.
|
||||
|
||||
If you want to see our biggest sponsors, check the top of [`README.md`](../README.md#sponsors).
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 130 KiB |
+17
-35
@@ -79,41 +79,23 @@ fn run_command_and_measure_common(
|
||||
let result = execute_and_measure(command)
|
||||
.with_context(|| format!("Failed to run command '{command_name}'"))?;
|
||||
|
||||
if !result.status.success() {
|
||||
use crate::util::exit_code::extract_exit_code;
|
||||
|
||||
let should_fail = match command_failure_action {
|
||||
CmdFailureAction::RaiseError => true,
|
||||
CmdFailureAction::IgnoreAllFailures => false,
|
||||
CmdFailureAction::IgnoreSpecificFailures(ref codes) => {
|
||||
// Only fail if the exit code is not in the list of codes to ignore
|
||||
if let Some(exit_code) = extract_exit_code(result.status) {
|
||||
!codes.contains(&exit_code)
|
||||
} else {
|
||||
// If we can't extract an exit code, treat it as a failure
|
||||
true
|
||||
}
|
||||
}
|
||||
if command_failure_action == CmdFailureAction::RaiseError && !result.status.success() {
|
||||
let when = match iteration {
|
||||
BenchmarkIteration::NonBenchmarkRun => "a non-benchmark run".to_string(),
|
||||
BenchmarkIteration::Warmup(0) => "the first warmup run".to_string(),
|
||||
BenchmarkIteration::Warmup(i) => format!("warmup iteration {i}"),
|
||||
BenchmarkIteration::Benchmark(0) => "the first benchmark run".to_string(),
|
||||
BenchmarkIteration::Benchmark(i) => format!("benchmark iteration {i}"),
|
||||
};
|
||||
bail!(
|
||||
"{cause} in {when}. Use the '-i'/'--ignore-failure' option if you want to ignore this. \
|
||||
Alternatively, use the '--show-output' option to debug what went wrong.",
|
||||
cause=result.status.code().map_or(
|
||||
"The process has been terminated by a signal".into(),
|
||||
|c| format!("Command terminated with non-zero exit code {c}")
|
||||
|
||||
if should_fail {
|
||||
let when = match iteration {
|
||||
BenchmarkIteration::NonBenchmarkRun => "a non-benchmark run".to_string(),
|
||||
BenchmarkIteration::Warmup(0) => "the first warmup run".to_string(),
|
||||
BenchmarkIteration::Warmup(i) => format!("warmup iteration {i}"),
|
||||
BenchmarkIteration::Benchmark(0) => "the first benchmark run".to_string(),
|
||||
BenchmarkIteration::Benchmark(i) => format!("benchmark iteration {i}"),
|
||||
};
|
||||
bail!(
|
||||
"{cause} in {when}. Use the '-i'/'--ignore-failure' option if you want to ignore this. \
|
||||
Alternatively, use the '--show-output' option to debug what went wrong.",
|
||||
cause=result.status.code().map_or(
|
||||
"The process has been terminated by a signal".into(),
|
||||
|c| format!("Command terminated with non-zero exit code {c}")
|
||||
|
||||
),
|
||||
);
|
||||
}
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Ok(result)
|
||||
@@ -140,7 +122,7 @@ impl Executor for RawExecutor<'_> {
|
||||
let result = run_command_and_measure_common(
|
||||
command.get_command()?,
|
||||
iteration,
|
||||
command_failure_action.unwrap_or_else(|| self.options.command_failure_action.clone()),
|
||||
command_failure_action.unwrap_or(self.options.command_failure_action),
|
||||
&self.options.command_input_policy,
|
||||
output_policy,
|
||||
&command.get_command_line(),
|
||||
@@ -205,7 +187,7 @@ impl Executor for ShellExecutor<'_> {
|
||||
let mut result = run_command_and_measure_common(
|
||||
command_builder,
|
||||
iteration,
|
||||
command_failure_action.unwrap_or_else(|| self.options.command_failure_action.clone()),
|
||||
command_failure_action.unwrap_or(self.options.command_failure_action),
|
||||
&self.options.command_input_policy,
|
||||
output_policy,
|
||||
&command.get_command_line(),
|
||||
|
||||
@@ -42,7 +42,7 @@ impl<'a> Scheduler<'a> {
|
||||
.options
|
||||
.reference_command
|
||||
.as_ref()
|
||||
.map(|cmd| Command::new(self.options.reference_name.as_deref(), cmd));
|
||||
.map(|cmd| Command::new(None, cmd));
|
||||
|
||||
executor.calibrate()?;
|
||||
|
||||
@@ -117,7 +117,7 @@ impl<'a> Scheduler<'a> {
|
||||
println!(
|
||||
"{} {}",
|
||||
comparator,
|
||||
item.result.command_with_unused_parameters.magenta()
|
||||
&item.result.command_with_unused_parameters.magenta()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -135,7 +135,7 @@ impl<'a> Scheduler<'a> {
|
||||
} else {
|
||||
" ".into()
|
||||
},
|
||||
item.result.command_with_unused_parameters,
|
||||
&item.result.command_with_unused_parameters,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-16
@@ -96,14 +96,6 @@ fn build_command() -> Command {
|
||||
If this is unset, results are compared with the fastest command as reference."
|
||||
)
|
||||
)
|
||||
.arg(
|
||||
Arg::new("reference-name")
|
||||
.long("reference-name")
|
||||
.action(ArgAction::Set)
|
||||
.value_name("CMD")
|
||||
.help("Give a meaningful name to the reference command.")
|
||||
.requires("reference")
|
||||
)
|
||||
.arg(
|
||||
Arg::new("prepare")
|
||||
.long("prepare")
|
||||
@@ -226,15 +218,9 @@ fn build_command() -> Command {
|
||||
.arg(
|
||||
Arg::new("ignore-failure")
|
||||
.long("ignore-failure")
|
||||
.action(ArgAction::Set)
|
||||
.value_name("MODE")
|
||||
.num_args(0..=1)
|
||||
.default_missing_value("all-non-zero")
|
||||
.require_equals(true)
|
||||
.action(ArgAction::SetTrue)
|
||||
.short('i')
|
||||
.help("Ignore failures of the benchmarked programs. Without a value or with \
|
||||
'all-non-zero', all non-zero exit codes are ignored. You can also provide \
|
||||
a comma-separated list of exit codes to ignore (e.g., --ignore-failure=1,2)."),
|
||||
.help("Ignore non-zero exit codes of the benchmarked programs."),
|
||||
)
|
||||
.arg(
|
||||
Arg::new("style")
|
||||
|
||||
+12
-49
@@ -158,9 +158,7 @@ impl<'a> Commands<'a> {
|
||||
});
|
||||
let args: Vec<_> = args.map(|v| v.as_str()).collect::<Vec<_>>();
|
||||
let param_names_and_values: Vec<(&str, Vec<String>)> = args
|
||||
.as_chunks::<2>()
|
||||
.0
|
||||
.iter()
|
||||
.chunks_exact(2)
|
||||
.map(|pair| {
|
||||
let name = pair[0];
|
||||
let list_str = pair[1];
|
||||
@@ -171,7 +169,7 @@ impl<'a> Commands<'a> {
|
||||
let duplicates =
|
||||
Self::find_duplicates(param_names_and_values.iter().map(|(name, _)| *name));
|
||||
if !duplicates.is_empty() {
|
||||
bail!("Duplicate parameter names: {}", duplicates.join(", "));
|
||||
bail!("Duplicate parameter names: {}", &duplicates.join(", "));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -279,8 +277,18 @@ impl<'a> Commands<'a> {
|
||||
command_strings: Vec<&'b str>,
|
||||
) -> Result<Vec<Command<'b>>, ParameterScanError> {
|
||||
let param_range = RangeStep::new(param_min, param_max, step)?;
|
||||
let param_count = param_range.size_hint().1.unwrap();
|
||||
let command_name_count = command_names.len();
|
||||
|
||||
// `--command-name` should appear exactly once or exactly B times,
|
||||
// where B is the total number of benchmarks.
|
||||
if command_name_count > 1 && command_name_count != param_count {
|
||||
return Err(ParameterScanError::UnexpectedCommandNameCount(
|
||||
command_name_count,
|
||||
param_count,
|
||||
));
|
||||
}
|
||||
|
||||
let mut i = 0;
|
||||
let mut commands = vec![];
|
||||
for value in param_range {
|
||||
@@ -297,17 +305,6 @@ impl<'a> Commands<'a> {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
|
||||
// `--command-name` should appear exactly once or exactly B times,
|
||||
// where B is the total number of benchmarks.
|
||||
let command_count = commands.len();
|
||||
if command_name_count > 1 && command_name_count != command_count {
|
||||
return Err(ParameterScanError::UnexpectedCommandNameCount(
|
||||
command_name_count,
|
||||
command_count,
|
||||
));
|
||||
}
|
||||
|
||||
Ok(commands)
|
||||
}
|
||||
|
||||
@@ -474,40 +471,6 @@ fn test_build_parameter_scan_commands() {
|
||||
assert_eq!(commands[1].get_command_line(), "echo 2");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_parameter_scan_commands_named() {
|
||||
use crate::cli::get_cli_arguments;
|
||||
let matches = get_cli_arguments(vec![
|
||||
"hyperfine",
|
||||
"echo {val}",
|
||||
"sleep {val}",
|
||||
"--parameter-scan",
|
||||
"val",
|
||||
"1",
|
||||
"2",
|
||||
"--parameter-step-size",
|
||||
"1",
|
||||
"--command-name",
|
||||
"echo-1",
|
||||
"--command-name",
|
||||
"sleep-1",
|
||||
"--command-name",
|
||||
"echo-2",
|
||||
"--command-name",
|
||||
"sleep-2",
|
||||
]);
|
||||
let commands = Commands::from_cli_arguments(&matches).unwrap().0;
|
||||
assert_eq!(commands.len(), 4);
|
||||
assert_eq!(commands[0].get_name(), "echo-1");
|
||||
assert_eq!(commands[0].get_command_line(), "echo 1");
|
||||
assert_eq!(commands[1].get_name(), "sleep-1");
|
||||
assert_eq!(commands[1].get_command_line(), "sleep 1");
|
||||
assert_eq!(commands[2].get_name(), "echo-2");
|
||||
assert_eq!(commands[2].get_command_line(), "echo 2");
|
||||
assert_eq!(commands[3].get_name(), "sleep-2");
|
||||
assert_eq!(commands[3].get_command_line(), "sleep 2");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parameter_scan_commands_int() {
|
||||
let commands = Commands::build_parameter_scan_commands(
|
||||
|
||||
@@ -9,7 +9,7 @@ impl MarkupExporter for OrgmodeExporter {
|
||||
format!(
|
||||
"| {} | {} |\n",
|
||||
cells.first().unwrap(),
|
||||
cells[1..].join(" | ")
|
||||
&cells[1..].join(" | ")
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+7
-29
@@ -67,16 +67,13 @@ impl Shell {
|
||||
}
|
||||
|
||||
/// Action to take when an executed command fails.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum CmdFailureAction {
|
||||
/// Exit with an error message
|
||||
RaiseError,
|
||||
|
||||
/// Ignore all non-zero exit codes
|
||||
IgnoreAllFailures,
|
||||
|
||||
/// Ignore specific exit codes
|
||||
IgnoreSpecificFailures(Vec<i32>),
|
||||
/// Simply ignore the non-zero exit code
|
||||
Ignore,
|
||||
}
|
||||
|
||||
/// Output style type option
|
||||
@@ -211,9 +208,6 @@ pub struct Options {
|
||||
// Command to use as a reference for relative speed comparison
|
||||
pub reference_command: Option<String>,
|
||||
|
||||
// Name of the reference command
|
||||
pub reference_name: Option<String>,
|
||||
|
||||
/// Command(s) to run before each timing run
|
||||
pub preparation_command: Option<Vec<String>>,
|
||||
|
||||
@@ -256,7 +250,6 @@ impl Default for Options {
|
||||
min_benchmarking_time: 3.0,
|
||||
command_failure_action: CmdFailureAction::RaiseError,
|
||||
reference_command: None,
|
||||
reference_name: None,
|
||||
preparation_command: None,
|
||||
conclusion_command: None,
|
||||
setup_command: None,
|
||||
@@ -317,9 +310,6 @@ impl Options {
|
||||
options.setup_command = matches.get_one::<String>("setup").map(String::from);
|
||||
|
||||
options.reference_command = matches.get_one::<String>("reference").map(String::from);
|
||||
options.reference_name = matches
|
||||
.get_one::<String>("reference-name")
|
||||
.map(String::from);
|
||||
|
||||
options.preparation_command = matches
|
||||
.get_many::<String>("prepare")
|
||||
@@ -364,7 +354,8 @@ impl Options {
|
||||
_ => {
|
||||
if options
|
||||
.command_output_policies
|
||||
.contains(&CommandOutputPolicy::Inherit)
|
||||
.iter()
|
||||
.any(|policy| *policy == CommandOutputPolicy::Inherit)
|
||||
|| !io::stdout().is_terminal()
|
||||
{
|
||||
OutputStyleOption::Basic
|
||||
@@ -418,21 +409,8 @@ impl Options {
|
||||
}
|
||||
};
|
||||
|
||||
if let Some(mode) = matches.get_one::<String>("ignore-failure") {
|
||||
options.command_failure_action = match mode.as_str() {
|
||||
"all-non-zero" | "" => CmdFailureAction::IgnoreAllFailures,
|
||||
codes => {
|
||||
let exit_codes: Result<Vec<i32>, _> = codes
|
||||
.split(',')
|
||||
.map(|s| {
|
||||
s.trim()
|
||||
.parse::<i32>()
|
||||
.map_err(|e| OptionsError::IntParsingError("ignore-failure", e))
|
||||
})
|
||||
.collect();
|
||||
CmdFailureAction::IgnoreSpecificFailures(exit_codes?)
|
||||
}
|
||||
};
|
||||
if matches.get_flag("ignore-failure") {
|
||||
options.command_failure_action = CmdFailureAction::Ignore;
|
||||
}
|
||||
|
||||
options.time_unit = match matches.get_one::<String>("time-unit").map(|s| s.as_str()) {
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
/// [1] Mytkowicz, 2009. Producing Wrong Data Without Doing Anything Obviously Wrong!.
|
||||
/// Sigplan Notices - SIGPLAN. 44. 265-276. 10.1145/1508284.1508275.
|
||||
pub fn value() -> String {
|
||||
"X".repeat(rand::random_range(0..4096))
|
||||
"X".repeat(rand::random::<usize>() % 4096usize)
|
||||
}
|
||||
+3
-1
@@ -1,7 +1,9 @@
|
||||
use std::process::Command;
|
||||
|
||||
use assert_cmd::cargo::CommandCargoExt;
|
||||
|
||||
pub fn hyperfine_raw_command() -> Command {
|
||||
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("hyperfine"));
|
||||
let mut cmd = Command::cargo_bin("hyperfine").unwrap();
|
||||
cmd.current_dir("tests/");
|
||||
cmd
|
||||
}
|
||||
|
||||
@@ -277,78 +277,6 @@ fn can_run_failing_commands_with_ignore_failure_option() {
|
||||
.success();
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn can_ignore_specific_exit_codes() {
|
||||
// Test that specifying exit code 1 ignores it
|
||||
hyperfine()
|
||||
.arg("--runs=1")
|
||||
.arg("--ignore-failure=1")
|
||||
.arg("exit 1")
|
||||
.assert()
|
||||
.success();
|
||||
|
||||
// Test that other exit codes still fail
|
||||
hyperfine()
|
||||
.arg("--runs=1")
|
||||
.arg("--ignore-failure=1")
|
||||
.arg("exit 2")
|
||||
.assert()
|
||||
.failure()
|
||||
.stderr(predicate::str::contains(
|
||||
"Command terminated with non-zero exit code 2",
|
||||
));
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn can_ignore_multiple_exit_codes() {
|
||||
// Test that all specified exit codes are ignored
|
||||
hyperfine()
|
||||
.arg("--runs=1")
|
||||
.arg("--ignore-failure=1,2,3")
|
||||
.arg("exit 1")
|
||||
.assert()
|
||||
.success();
|
||||
|
||||
hyperfine()
|
||||
.arg("--runs=1")
|
||||
.arg("--ignore-failure=1,2,3")
|
||||
.arg("exit 2")
|
||||
.assert()
|
||||
.success();
|
||||
|
||||
hyperfine()
|
||||
.arg("--runs=1")
|
||||
.arg("--ignore-failure=1,2,3")
|
||||
.arg("exit 3")
|
||||
.assert()
|
||||
.success();
|
||||
|
||||
// Test that other exit codes still fail
|
||||
hyperfine()
|
||||
.arg("--runs=1")
|
||||
.arg("--ignore-failure=1,2,3")
|
||||
.arg("exit 4")
|
||||
.assert()
|
||||
.failure()
|
||||
.stderr(predicate::str::contains(
|
||||
"Command terminated with non-zero exit code 4",
|
||||
));
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn ignore_failure_with_all_non_zero() {
|
||||
// Test explicit "all-non-zero" mode
|
||||
hyperfine()
|
||||
.arg("--runs=1")
|
||||
.arg("--ignore-failure=all-non-zero")
|
||||
.arg("exit 5")
|
||||
.assert()
|
||||
.success();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shows_output_of_benchmarked_command() {
|
||||
hyperfine()
|
||||
@@ -571,18 +499,6 @@ fn shows_benchmark_comparison_relative_to_reference() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shows_reference_name() {
|
||||
hyperfine_debug()
|
||||
.arg("--reference=sleep 2.0")
|
||||
.arg("--reference-name=refabc123")
|
||||
.arg("sleep 1.0")
|
||||
.arg("sleep 3.0")
|
||||
.assert()
|
||||
.success()
|
||||
.stdout(predicate::str::contains("Benchmark 1: refabc123"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn performs_all_benchmarks_in_parameter_scan() {
|
||||
hyperfine_debug()
|
||||
|
||||
Reference in new issue
Block a user