Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Stricter parallel Exists Check #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 14, 2023
Merged

Stricter parallel Exists Check #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29f7ce5
Stricter `parallel` Exists Check
qec-pconner Jan 4, 2023
e959587
* Adding improved parallel check into libexec/bats-core/bats-exec-suite.
qec-pconner Jan 13, 2023
9a3b136
Add changelog entry for #691
martin-schulze-vireso Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ The format is based on [Keep a Changelog][kac] and this project adheres to

### Fixed

* explicitly check for GNU parallel (#691)

#### Documentation

* improved clarity of section about output in free code (#671)
Expand Down
2 changes: 1 addition & 1 deletion libexec/bats-core/bats-exec-suite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ while [[ "$#" -ne 0 ]]; do
done

if [[ "$num_jobs" != 1 ]]; then
if ! type -p parallel >/dev/null && [[ -z "$bats_no_parallelize_across_files" ]]; then
if ! type -p parallel >/dev/null && parallel --version &>/dev/null && [[ -z "$bats_no_parallelize_across_files" ]]; then
abort "Cannot execute \"${num_jobs}\" jobs without GNU parallel"
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion test/parallel.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fixtures parallel
BATS_TEST_TIMEOUT=10 # only intended for the "short form ..."" test

setup() {
type -p parallel &>/dev/null || skip "--jobs requires GNU parallel"
(type -p parallel &>/dev/null && parallel --version &>/dev/null) || skip "--jobs requires GNU parallel"
(type -p flock &>/dev/null || type -p shlock &>/dev/null) || skip "--jobs requires flock/shlock"
}

Expand Down