diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-27 23:54:35 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-29 08:52:25 -0300 |
commit | 93a5d7a2f5f8771f79ae89936a74ca45bfe48660 (patch) | |
tree | 3f27a26666ad57c702636e577f08aaa1b2dbd23f | |
parent | build: format gcov.sh (diff) | |
download | firejail-93a5d7a2f5f8771f79ae89936a74ca45bfe48660.tar.gz firejail-93a5d7a2f5f8771f79ae89936a74ca45bfe48660.tar.zst firejail-93a5d7a2f5f8771f79ae89936a74ca45bfe48660.zip |
build: standardize parallel make arguments
Currently the number of make jobs used for the default build target are
hardcoded and the value used varies across files.
For consistency (and potentially better performance), use
`make -j "$(nproc)"` everywhere that `make -j` is currently used.
Kind of relates to commit 500d8f2d6 ("ci: run make in parallel where
applicable", 2023-08-14) / PR #5960.
-rwxr-xr-x | gcov.sh | 2 | ||||
-rwxr-xr-x | mkdeb.sh | 2 | ||||
-rwxr-xr-x | src/tools/mkcoverit.sh | 2 | ||||
-rwxr-xr-x | test/compile/compile.sh | 38 |
4 files changed, 22 insertions, 22 deletions
@@ -23,7 +23,7 @@ gcov_generate() { | |||
23 | make distclean && | 23 | make distclean && |
24 | ./configure --prefix=/usr --enable-fatal-warnings \ | 24 | ./configure --prefix=/usr --enable-fatal-warnings \ |
25 | --enable-apparmor --enable-gcov && | 25 | --enable-apparmor --enable-gcov && |
26 | make -j4 && | 26 | make -j "$(nproc)" && |
27 | sudo make install | 27 | sudo make install |
28 | 28 | ||
29 | rm -fr gcov-dir gcov-file | 29 | rm -fr gcov-dir gcov-file |
@@ -26,7 +26,7 @@ tar -xJvf "$CODE_ARCHIVE" | |||
26 | #mkdir -p "$INSTALL_DIR" | 26 | #mkdir -p "$INSTALL_DIR" |
27 | cd "$CODE_DIR" | 27 | cd "$CODE_DIR" |
28 | ./configure --prefix=/usr --enable-apparmor "$@" | 28 | ./configure --prefix=/usr --enable-apparmor "$@" |
29 | make -j2 | 29 | make -j "$(nproc)" |
30 | mkdir debian | 30 | mkdir debian |
31 | DESTDIR=debian make install-strip | 31 | DESTDIR=debian make install-strip |
32 | 32 | ||
diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh index 2d54f7c66..2b1c0a9d8 100755 --- a/src/tools/mkcoverit.sh +++ b/src/tools/mkcoverit.sh | |||
@@ -44,5 +44,5 @@ mv $DIRFIRETOOLS $DIRFIREJAIL/extras/firetools | |||
44 | 44 | ||
45 | # build | 45 | # build |
46 | cd $DIRFIREJAIL | 46 | cd $DIRFIREJAIL |
47 | cov-build --dir cov-int make -j 4 extras | 47 | cov-build --dir cov-int make -j "$(nproc)" extras |
48 | tar czvf myproject.tgz cov-int | 48 | tar czvf myproject.tgz cov-int |
diff --git a/test/compile/compile.sh b/test/compile/compile.sh index 4e9b6bed2..30bfe9e66 100755 --- a/test/compile/compile.sh +++ b/test/compile/compile.sh | |||
@@ -82,7 +82,7 @@ mv "$DIST" firejail | |||
82 | 82 | ||
83 | cd firejail || exit 1 | 83 | cd firejail || exit 1 |
84 | ./configure --prefix=/usr --enable-fatal-warnings 2>&1 | tee ../output-configure | 84 | ./configure --prefix=/usr --enable-fatal-warnings 2>&1 | tee ../output-configure |
85 | make -j4 2>&1 | tee ../output-make | 85 | make -j "$(nproc)" 2>&1 | tee ../output-make |
86 | cd .. | 86 | cd .. |
87 | grep Warning output-configure output-make > ./report-test1 | 87 | grep Warning output-configure output-make > ./report-test1 |
88 | grep Error output-configure output-make >> ./report-test1 | 88 | grep Error output-configure output-make >> ./report-test1 |
@@ -99,7 +99,7 @@ print_title "${arr[2]}" | |||
99 | cd firejail || exit 1 | 99 | cd firejail || exit 1 |
100 | make distclean | 100 | make distclean |
101 | ./configure --prefix=/usr --disable-dbusproxy --enable-fatal-warnings 2>&1 | tee ../output-configure | 101 | ./configure --prefix=/usr --disable-dbusproxy --enable-fatal-warnings 2>&1 | tee ../output-configure |
102 | make -j4 2>&1 | tee ../output-make | 102 | make -j "$(nproc)" 2>&1 | tee ../output-make |
103 | cd .. | 103 | cd .. |
104 | grep Warning output-configure output-make > ./report-test2 | 104 | grep Warning output-configure output-make > ./report-test2 |
105 | grep Error output-configure output-make >> ./report-test2 | 105 | grep Error output-configure output-make >> ./report-test2 |
@@ -116,7 +116,7 @@ print_title "${arr[3]}" | |||
116 | cd firejail || exit 1 | 116 | cd firejail || exit 1 |
117 | make distclean | 117 | make distclean |
118 | ./configure --prefix=/usr --disable-chroot --enable-fatal-warnings 2>&1 | tee ../output-configure | 118 | ./configure --prefix=/usr --disable-chroot --enable-fatal-warnings 2>&1 | tee ../output-configure |
119 | make -j4 2>&1 | tee ../output-make | 119 | make -j "$(nproc)" 2>&1 | tee ../output-make |
120 | cd .. | 120 | cd .. |
121 | grep Warning output-configure output-make > ./report-test3 | 121 | grep Warning output-configure output-make > ./report-test3 |
122 | grep Error output-configure output-make >> ./report-test3 | 122 | grep Error output-configure output-make >> ./report-test3 |
@@ -133,7 +133,7 @@ print_title "${arr[4]}" | |||
133 | cd firejail || exit 1 | 133 | cd firejail || exit 1 |
134 | make distclean | 134 | make distclean |
135 | ./configure --prefix=/usr --disable-firetunnel --enable-fatal-warnings 2>&1 | tee ../output-configure | 135 | ./configure --prefix=/usr --disable-firetunnel --enable-fatal-warnings 2>&1 | tee ../output-configure |
136 | make -j4 2>&1 | tee ../output-make | 136 | make -j "$(nproc)" 2>&1 | tee ../output-make |
137 | cd .. | 137 | cd .. |
138 | grep Warning output-configure output-make > ./report-test4 | 138 | grep Warning output-configure output-make > ./report-test4 |
139 | grep Error output-configure output-make >> ./report-test4 | 139 | grep Error output-configure output-make >> ./report-test4 |
@@ -150,7 +150,7 @@ print_title "${arr[5]}" | |||
150 | cd firejail || exit 1 | 150 | cd firejail || exit 1 |
151 | make distclean | 151 | make distclean |
152 | ./configure --prefix=/usr --disable-userns --enable-fatal-warnings 2>&1 | tee ../output-configure | 152 | ./configure --prefix=/usr --disable-userns --enable-fatal-warnings 2>&1 | tee ../output-configure |
153 | make -j4 2>&1 | tee ../output-make | 153 | make -j "$(nproc)" 2>&1 | tee ../output-make |
154 | cd .. | 154 | cd .. |
155 | grep Warning output-configure output-make > ./report-test5 | 155 | grep Warning output-configure output-make > ./report-test5 |
156 | grep Error output-configure output-make >> ./report-test5 | 156 | grep Error output-configure output-make >> ./report-test5 |
@@ -168,7 +168,7 @@ print_title "${arr[6]}" | |||
168 | cd firejail || exit 1 | 168 | cd firejail || exit 1 |
169 | make distclean | 169 | make distclean |
170 | ./configure --prefix=/usr --disable-network --enable-fatal-warnings 2>&1 | tee ../output-configure | 170 | ./configure --prefix=/usr --disable-network --enable-fatal-warnings 2>&1 | tee ../output-configure |
171 | make -j4 2>&1 | tee ../output-make | 171 | make -j "$(nproc)" 2>&1 | tee ../output-make |
172 | cd .. | 172 | cd .. |
173 | grep Warning output-configure output-make > ./report-test6 | 173 | grep Warning output-configure output-make > ./report-test6 |
174 | grep Error output-configure output-make >> ./report-test6 | 174 | grep Error output-configure output-make >> ./report-test6 |
@@ -185,7 +185,7 @@ print_title "${arr[7]}" | |||
185 | cd firejail || exit 1 | 185 | cd firejail || exit 1 |
186 | make distclean | 186 | make distclean |
187 | ./configure --prefix=/usr --disable-x11 --enable-fatal-warnings 2>&1 | tee ../output-configure | 187 | ./configure --prefix=/usr --disable-x11 --enable-fatal-warnings 2>&1 | tee ../output-configure |
188 | make -j4 2>&1 | tee ../output-make | 188 | make -j "$(nproc)" 2>&1 | tee ../output-make |
189 | cd .. | 189 | cd .. |
190 | grep Warning output-configure output-make > ./report-test7 | 190 | grep Warning output-configure output-make > ./report-test7 |
191 | grep Error output-configure output-make >> ./report-test7 | 191 | grep Error output-configure output-make >> ./report-test7 |
@@ -202,7 +202,7 @@ print_title "${arr[8]}" | |||
202 | cd firejail || exit 1 | 202 | cd firejail || exit 1 |
203 | make distclean | 203 | make distclean |
204 | ./configure --prefix=/usr --enable-selinux --enable-fatal-warnings 2>&1 | tee ../output-configure | 204 | ./configure --prefix=/usr --enable-selinux --enable-fatal-warnings 2>&1 | tee ../output-configure |
205 | make -j4 2>&1 | tee ../output-make | 205 | make -j "$(nproc)" 2>&1 | tee ../output-make |
206 | cd .. | 206 | cd .. |
207 | grep Warning output-configure output-make > ./report-test8 | 207 | grep Warning output-configure output-make > ./report-test8 |
208 | grep Error output-configure output-make >> ./report-test8 | 208 | grep Error output-configure output-make >> ./report-test8 |
@@ -219,7 +219,7 @@ print_title "${arr[9]}" | |||
219 | cd firejail || exit 1 | 219 | cd firejail || exit 1 |
220 | make distclean | 220 | make distclean |
221 | ./configure --prefix=/usr --disable-file-transfer --enable-fatal-warnings 2>&1 | tee ../output-configure | 221 | ./configure --prefix=/usr --disable-file-transfer --enable-fatal-warnings 2>&1 | tee ../output-configure |
222 | make -j4 2>&1 | tee ../output-make | 222 | make -j "$(nproc)" 2>&1 | tee ../output-make |
223 | cd .. | 223 | cd .. |
224 | grep Warning output-configure output-make > ./report-test9 | 224 | grep Warning output-configure output-make > ./report-test9 |
225 | grep Error output-configure output-make >> ./report-test9 | 225 | grep Error output-configure output-make >> ./report-test9 |
@@ -236,7 +236,7 @@ print_title "${arr[10]}" | |||
236 | cd firejail || exit 1 | 236 | cd firejail || exit 1 |
237 | make distclean | 237 | make distclean |
238 | ./configure --prefix=/usr --disable-whitelist --enable-fatal-warnings 2>&1 | tee ../output-configure | 238 | ./configure --prefix=/usr --disable-whitelist --enable-fatal-warnings 2>&1 | tee ../output-configure |
239 | make -j4 2>&1 | tee ../output-make | 239 | make -j "$(nproc)" 2>&1 | tee ../output-make |
240 | cd .. | 240 | cd .. |
241 | grep Warning output-configure output-make > ./report-test10 | 241 | grep Warning output-configure output-make > ./report-test10 |
242 | grep Error output-configure output-make >> ./report-test10 | 242 | grep Error output-configure output-make >> ./report-test10 |
@@ -253,7 +253,7 @@ print_title "${arr[11]}" | |||
253 | cd firejail || exit 1 | 253 | cd firejail || exit 1 |
254 | make distclean | 254 | make distclean |
255 | ./configure --prefix=/usr --disable-globalcfg --enable-fatal-warnings 2>&1 | tee ../output-configure | 255 | ./configure --prefix=/usr --disable-globalcfg --enable-fatal-warnings 2>&1 | tee ../output-configure |
256 | make -j4 2>&1 | tee ../output-make | 256 | make -j "$(nproc)" 2>&1 | tee ../output-make |
257 | cd .. | 257 | cd .. |
258 | grep Warning output-configure output-make > ./report-test11 | 258 | grep Warning output-configure output-make > ./report-test11 |
259 | grep Error output-configure output-make >> ./report-test11 | 259 | grep Error output-configure output-make >> ./report-test11 |
@@ -270,7 +270,7 @@ print_title "${arr[12]}" | |||
270 | cd firejail || exit 1 | 270 | cd firejail || exit 1 |
271 | make distclean | 271 | make distclean |
272 | ./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure | 272 | ./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure |
273 | make -j4 2>&1 | tee ../output-make | 273 | make -j "$(nproc)" 2>&1 | tee ../output-make |
274 | cd .. | 274 | cd .. |
275 | grep Warning output-configure output-make > ./report-test12 | 275 | grep Warning output-configure output-make > ./report-test12 |
276 | grep Error output-configure output-make >> ./report-test12 | 276 | grep Error output-configure output-make >> ./report-test12 |
@@ -287,7 +287,7 @@ print_title "${arr[13]}" | |||
287 | cd firejail || exit 1 | 287 | cd firejail || exit 1 |
288 | make distclean | 288 | make distclean |
289 | ./configure --prefix=/usr --enable-busybox-workaround --enable-fatal-warnings 2>&1 | tee ../output-configure | 289 | ./configure --prefix=/usr --enable-busybox-workaround --enable-fatal-warnings 2>&1 | tee ../output-configure |
290 | make -j4 2>&1 | tee ../output-make | 290 | make -j "$(nproc)" 2>&1 | tee ../output-make |
291 | cd .. | 291 | cd .. |
292 | grep Warning output-configure output-make > ./report-test13 | 292 | grep Warning output-configure output-make > ./report-test13 |
293 | grep Error output-configure output-make >> ./report-test13 | 293 | grep Error output-configure output-make >> ./report-test13 |
@@ -304,7 +304,7 @@ print_title "${arr[14]}" | |||
304 | cd firejail || exit 1 | 304 | cd firejail || exit 1 |
305 | make distclean | 305 | make distclean |
306 | ./configure --prefix=/usr --disable-overlayfs --enable-fatal-warnings 2>&1 | tee ../output-configure | 306 | ./configure --prefix=/usr --disable-overlayfs --enable-fatal-warnings 2>&1 | tee ../output-configure |
307 | make -j4 2>&1 | tee ../output-make | 307 | make -j "$(nproc)" 2>&1 | tee ../output-make |
308 | cd .. | 308 | cd .. |
309 | grep Warning output-configure output-make > ./report-test14 | 309 | grep Warning output-configure output-make > ./report-test14 |
310 | grep Error output-configure output-make >> ./report-test14 | 310 | grep Error output-configure output-make >> ./report-test14 |
@@ -321,7 +321,7 @@ print_title "${arr[15]}" | |||
321 | cd firejail || exit 1 | 321 | cd firejail || exit 1 |
322 | make distclean | 322 | make distclean |
323 | ./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure | 323 | ./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure |
324 | make -j4 2>&1 | tee ../output-make | 324 | make -j "$(nproc)" 2>&1 | tee ../output-make |
325 | cd .. | 325 | cd .. |
326 | grep Warning output-configure output-make > ./report-test15 | 326 | grep Warning output-configure output-make > ./report-test15 |
327 | grep Error output-configure output-make >> ./report-test15 | 327 | grep Error output-configure output-make >> ./report-test15 |
@@ -338,7 +338,7 @@ print_title "${arr[16]}" | |||
338 | cd firejail || exit 1 | 338 | cd firejail || exit 1 |
339 | make distclean | 339 | make distclean |
340 | ./configure --prefix=/usr --disable-man --enable-fatal-warnings 2>&1 | tee ../output-configure | 340 | ./configure --prefix=/usr --disable-man --enable-fatal-warnings 2>&1 | tee ../output-configure |
341 | make -j4 2>&1 | tee ../output-make | 341 | make -j "$(nproc)" 2>&1 | tee ../output-make |
342 | cd .. | 342 | cd .. |
343 | grep Warning output-configure output-make > ./report-test16 | 343 | grep Warning output-configure output-make > ./report-test16 |
344 | grep Error output-configure output-make >> ./report-test16 | 344 | grep Error output-configure output-make >> ./report-test16 |
@@ -355,7 +355,7 @@ print_title "${arr[17]}" | |||
355 | cd firejail || exit 1 | 355 | cd firejail || exit 1 |
356 | make distclean | 356 | make distclean |
357 | ./configure --prefix=/usr --disable-usertmpfs --enable-fatal-warnings 2>&1 | tee ../output-configure | 357 | ./configure --prefix=/usr --disable-usertmpfs --enable-fatal-warnings 2>&1 | tee ../output-configure |
358 | make -j4 2>&1 | tee ../output-make | 358 | make -j "$(nproc)" 2>&1 | tee ../output-make |
359 | cd .. | 359 | cd .. |
360 | grep Warning output-configure output-make > ./report-test17 | 360 | grep Warning output-configure output-make > ./report-test17 |
361 | grep Error output-configure output-make >> ./report-test17 | 361 | grep Error output-configure output-make >> ./report-test17 |
@@ -372,7 +372,7 @@ print_title "${arr[18]}" | |||
372 | cd firejail || exit 1 | 372 | cd firejail || exit 1 |
373 | make distclean | 373 | make distclean |
374 | ./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure | 374 | ./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure |
375 | make -j4 2>&1 | tee ../output-make | 375 | make -j "$(nproc)" 2>&1 | tee ../output-make |
376 | cd .. | 376 | cd .. |
377 | grep Warning output-configure output-make > ./report-test18 | 377 | grep Warning output-configure output-make > ./report-test18 |
378 | grep Error output-configure output-make >> ./report-test18 | 378 | grep Error output-configure output-make >> ./report-test18 |
@@ -389,7 +389,7 @@ print_title "${arr[19]}" | |||
389 | cd firejail || exit 1 | 389 | cd firejail || exit 1 |
390 | make distclean | 390 | make distclean |
391 | ./configure --prefix=/usr --enable-ids --enable-fatal-warnings 2>&1 | tee ../output-configure | 391 | ./configure --prefix=/usr --enable-ids --enable-fatal-warnings 2>&1 | tee ../output-configure |
392 | make -j4 2>&1 | tee ../output-make | 392 | make -j "$(nproc)" 2>&1 | tee ../output-make |
393 | cd .. | 393 | cd .. |
394 | grep Warning output-configure output-make > ./report-test19 | 394 | grep Warning output-configure output-make > ./report-test19 |
395 | grep Error output-configure output-make >> ./report-test19 | 395 | grep Error output-configure output-make >> ./report-test19 |