aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-06-15 03:31:37 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-06-15 12:52:45 -0300
commitfd1cbf6c904248d2b86e56389ea522e92da99118 (patch)
treec010c8f4b1eebc8231bdef4d92dd8c12633abe18
parentbuild(deps): bump github/codeql-action from 2.3.5 to 2.3.6 (diff)
downloadfirejail-fd1cbf6c904248d2b86e56389ea522e92da99118.tar.gz
firejail-fd1cbf6c904248d2b86e56389ea522e92da99118.tar.zst
firejail-fd1cbf6c904248d2b86e56389ea522e92da99118.zip
build: mark phony test targets as such
See commit f48886f25 ("build: mark most phony targets as such", 2023-02-01) / PR #5637.
-rw-r--r--Makefile10
-rw-r--r--RELNOTES2
2 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 749457b1b..c69c1894f 100644
--- a/Makefile
+++ b/Makefile
@@ -380,36 +380,45 @@ $(TEST_TARGETS):
380 380
381 381
382# extract some data about the testing setup: kernel, network connectivity, user 382# extract some data about the testing setup: kernel, network connectivity, user
383.PHONY: lab-setup
383lab-setup:; uname -r; ldd --version | grep GLIBC; pwd; whoami; ip addr show; cat /etc/resolv.conf; cat /etc/hosts; ls /etc 384lab-setup:; uname -r; ldd --version | grep GLIBC; pwd; whoami; ip addr show; cat /etc/resolv.conf; cat /etc/hosts; ls /etc
384 385
386.PHONY: test
385test: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-private-etc test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-seccomp-extra 387test: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-private-etc test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-seccomp-extra
386 echo "TEST COMPLETE" 388 echo "TEST COMPLETE"
387 389
390.PHONY: test-noprofiles
388test-noprofiles: lab-setup test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters 391test-noprofiles: lab-setup test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters
389 echo "TEST COMPLETE" 392 echo "TEST COMPLETE"
390 393
391# not included in "make dist" and "make test" 394# not included in "make dist" and "make test"
395.PHONY: test-appimage
392test-appimage: 396test-appimage:
393 $(MAKE) -C test $(subst test-,,$@) 397 $(MAKE) -C test $(subst test-,,$@)
394 398
395# using sudo; not included in "make dist" and "make test" 399# using sudo; not included in "make dist" and "make test"
400.PHONY: test-chroot
396test-chroot: 401test-chroot:
397 $(MAKE) -C test $(subst test-,,$@) 402 $(MAKE) -C test $(subst test-,,$@)
398 403
399# using sudo; not included in "make dist" and "make test" 404# using sudo; not included in "make dist" and "make test"
405.PHONY: test-network
400test-network: 406test-network:
401 $(MAKE) -C test $(subst test-,,$@) 407 $(MAKE) -C test $(subst test-,,$@)
402 408
403# using sudo; not included in "make dist" and "make test" 409# using sudo; not included in "make dist" and "make test"
410.PHONY: test-apparmor
404test-apparmor: 411test-apparmor:
405 $(MAKE) -C test $(subst test-,,$@) 412 $(MAKE) -C test $(subst test-,,$@)
406 413
407# using sudo; not included in "make dist" and "make test" 414# using sudo; not included in "make dist" and "make test"
415.PHONY: test-firecfg
408test-firecfg: 416test-firecfg:
409 $(MAKE) -C test $(subst test-,,$@) 417 $(MAKE) -C test $(subst test-,,$@)
410 418
411 419
412# old gihub test; the new test is driven directly from .github/workflows/build.yml 420# old gihub test; the new test is driven directly from .github/workflows/build.yml
421.PHONY: test-github
413test-github: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment 422test-github: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment
414 echo "TEST COMPLETE" 423 echo "TEST COMPLETE"
415 424
@@ -419,6 +428,7 @@ test-github: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-uti
419# with them you will need to restart your computer. 428# with them you will need to restart your computer.
420########################################## 429##########################################
421# private-lib is disabled by default in /etc/firejail/firejail.config 430# private-lib is disabled by default in /etc/firejail/firejail.config
431.PHONY: test-private-lib
422test-private-lib: 432test-private-lib:
423 $(MAKE) -C test $(subst test-,,$@) 433 $(MAKE) -C test $(subst test-,,$@)
424 434
diff --git a/RELNOTES b/RELNOTES
index 9922dbdb4..49c2fbce0 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -18,7 +18,7 @@ firejail (0.9.73) baseline; urgency=low
18 * bugfix: fix --hostname and --hosts-file commands 18 * bugfix: fix --hostname and --hosts-file commands
19 * bugfix: arp.c: ensure positive timeout on select(2) (#5806) 19 * bugfix: arp.c: ensure positive timeout on select(2) (#5806)
20 * build: auto-generate syntax files (#5627) 20 * build: auto-generate syntax files (#5627)
21 * build: mark most phony targets as such (#5637) 21 * build: mark all phony targets as such (#5637)
22 * build: mkdeb.sh: pass all arguments to ./configure (#5654) 22 * build: mkdeb.sh: pass all arguments to ./configure (#5654)
23 * build: deb: enable apparmor by default & remove deb-apparmor (#5668) 23 * build: deb: enable apparmor by default & remove deb-apparmor (#5668)
24 * build: Fix whitespace and add .editorconfig (#5674) 24 * build: Fix whitespace and add .editorconfig (#5674)