Skip to content
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.

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

v1.7 fix - test/bpf: use nproc --all instead of nproc -all #12401

Merged
merged 1 commit into from
Jul 6, 2020

Conversation

tklauser
Copy link
Member

@tklauser tklauser commented Jul 3, 2020

When the __NR_CPUS__ definitions were change to use nproc --all in commit
6247cc5 ("bpf: Use nproc --all for __NR_CPUS__") via #12363 the
change in test/bpf/Makefile was missing a -, leading to the following
error message in the v1.8 build:

make -C test/bpf/
nproc: invalid option -- 'a'
Try 'nproc --help' for more information.

While this is uncritical for the tests and the build, but fix it
nevertheless to get rid of the error message.

When the __NR_CPUS__ definitions were change to use nproc --all in commit
6247cc5 ("bpf: Use `nproc --all` for __NR_CPUS__") via #12363 the
change in test/bpf/Makefile was missing a `-`, leading to the following
error message in the v1.8 build:

  make -C test/bpf/
  nproc: invalid option -- 'a'
  Try 'nproc --help' for more information.

While this is uncritical for the tests and the build, but fix it
nevertheless to get rid of the error message.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser requested a review from gandro July 3, 2020 09:41
@tklauser tklauser requested a review from a team as a code owner July 3, 2020 09:41
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Jul 3, 2020
@tklauser
Copy link
Member Author

tklauser commented Jul 3, 2020

test-backport-1.7

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 6, 2020
@aanm aanm merged commit 9066d74 into v1.7 Jul 6, 2020
@aanm aanm deleted the pr/tklauser/v1.7-fix-test-bpf-nproc branch July 6, 2020 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants