chiark
/
gitweb
/
~ian
/
secnet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2e7816
)
stest: Fix breakage if nproc is not installed
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 5 Dec 2019 01:48:04 +0000
(
01:48
+0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 7 Dec 2019 17:08:49 +0000
(17:08 +0000)
This needs to echo 1, not try to run it. The effect is a message on
stderr and passing `make -j'. That is actually mostly OK since we
have few tests right now...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
stest/Subdir.sd.mk
patch
|
blob
|
history
diff --git
a/stest/Subdir.sd.mk
b/stest/Subdir.sd.mk
index 4c2d1a138105af02a35e59cb444e7be41274ee26..d8191700137a29ca8b22132567ef59fc310e9367 100644
(file)
--- a/
stest/Subdir.sd.mk
+++ b/
stest/Subdir.sd.mk
@@
-33,6
+33,6
@@
MAKE_NOTSPECIAL:=$(MAKE)
&check:: $(&DEPS)
env -u MAKEFLAGS -u MFLAGS \
- $(MAKE_NOTSPECIAL) -f main.mk -j$(shell nproc || 1)0 &check-real
+ $(MAKE_NOTSPECIAL) -f main.mk -j$(shell nproc ||
echo
1)0 &check-real
&:include subdirmk/cdeps.sd.mk