aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2022-07-10 11:07:46 -0400
committerLibravatar netblue30 <netblue30@protonmail.com>2022-07-10 11:07:46 -0400
commit502b9bbd908ef724f1fa64e29ceb3d430907b9c0 (patch)
tree623913c654c470223dd5295cf663a00362d5f522
parentMerge pull request #5242 from alkim0/master (diff)
downloadfirejail-502b9bbd908ef724f1fa64e29ceb3d430907b9c0.tar.gz
firejail-502b9bbd908ef724f1fa64e29ceb3d430907b9c0.tar.zst
firejail-502b9bbd908ef724f1fa64e29ceb3d430907b9c0.zip
testing fix
-rw-r--r--README5
-rwxr-xr-xtest/profiles/all-profiles.sh47
-rwxr-xr-xtest/profiles/profiles.sh11
3 files changed, 54 insertions, 9 deletions
diff --git a/README b/README
index d4e76dcb8..713f5ca3f 100644
--- a/README
+++ b/README
@@ -67,6 +67,8 @@ Firejail Authors (alphabetical order)
670x7969 (https://github.com/0x7969) 670x7969 (https://github.com/0x7969)
68 - fix wire-desktop.profile 68 - fix wire-desktop.profile
69 - add ferdi.profile 69 - add ferdi.profile
700x9fff00 (https://github.com/0x9fff00)
71 - add Colossal Order to steam.profile
707twin (https://github.com/7twin_) 727twin (https://github.com/7twin_)
71 - fix typos 73 - fix typos
72 - fix flameshot raw screenshots 74 - fix flameshot raw screenshots
@@ -116,6 +118,8 @@ Alexander Gerasiov (https://github.com/gerasiov)
116 - profile updates 118 - profile updates
117Alexander Stein (https://github.com/ajstein) 119Alexander Stein (https://github.com/ajstein)
118 - added profile for qutebrowser 120 - added profile for qutebrowser
121alkim0 (https://github.com/alkim0)
122 - warn when encountering EIO during remount
119Amin Vakil (https://github.com/aminvakil) 123Amin Vakil (https://github.com/aminvakil)
120 - whois profile fix 124 - whois profile fix
121 - added profile for strawberry 125 - added profile for strawberry
@@ -316,6 +320,7 @@ Davide Beatrici (https://github.com/davidebeatrici)
316 - minetest fixes 320 - minetest fixes
317 - map /dev/input with "--private-dev", add "--no-input" option to disable it 321 - map /dev/input with "--private-dev", add "--no-input" option to disable it
318 - whitelist /usr/share/TelegramDesktop in telegram.profile 322 - whitelist /usr/share/TelegramDesktop in telegram.profile
323 - allow access to ~/.cache/winetricks
319David Hyrule (https://github.com/Svaag) 324David Hyrule (https://github.com/Svaag)
320 - remove nou2f in ssh profile 325 - remove nou2f in ssh profile
321Deelvesh Bunjun (https://github.com/DeelveshBunjun) 326Deelvesh Bunjun (https://github.com/DeelveshBunjun)
diff --git a/test/profiles/all-profiles.sh b/test/profiles/all-profiles.sh
new file mode 100755
index 000000000..cc17b6b00
--- /dev/null
+++ b/test/profiles/all-profiles.sh
@@ -0,0 +1,47 @@
1#!/bin/bash
2# This file is part of Firejail project
3# Copyright (C) 2014-2022 Firejail Authors
4# License GPL v2
5
6export MALLOC_CHECK_=3
7export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
8export LC_ALL=C
9
10echo "TESTING: profile comments (test/profiles/profilecomment.exp)"
11./profile_comment.exp
12
13echo "TESTING: profile conditional (test/profiles/conditional.exp)"
14./conditional.exp
15
16echo "TESTING: profile recursivity (test/profiles/profile_recursivity.exp)"
17./profile_recursivity.exp
18
19echo "TESTING: profile application name (test/profiles/profile_appname.exp)"
20./profile_appname.exp
21
22echo "TESTING: profile syntax (test/profiles/profile_syntax.exp)"
23./profile_syntax.exp
24
25echo "TESTING: profile syntax 2 (test/profiles/profile_syntax2.exp)"
26./profile_syntax2.exp
27
28echo "TESTING: ignore command (test/profiles/ignore.exp)"
29./ignore.exp
30
31echo "TESTING: profile read-only (test/profiles/profile_readonly.exp)"
32./profile_readonly.exp
33
34echo "TESTING: profile read-only links (test/profiles/profile_readonly.exp)"
35./profile_followlnk.exp
36
37echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)"
38./profile_noperm.exp
39
40PROFILES=`ls /etc/firejail/*.profile`
41echo "TESTING: default profiles installed in /etc"
42
43for PROFILE in $PROFILES
44do
45 echo "TESTING: $PROFILE"
46 ./test-profile.exp $PROFILE
47done
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index ce2fa32c4..8808bc9d2 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -37,15 +37,8 @@ echo "TESTING: profile read-only links (test/profiles/profile_readonly.exp)"
37echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)" 37echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)"
38./profile_noperm.exp 38./profile_noperm.exp
39 39
40# GitHub CI doesn't have a /run/user/$UID directory. Using it to test a small number of profiles. 40PROFILES=`ls /etc/firejail/transmission*.profile /etc/firejail/fi*.profile /etc/firejail/fl*.profile /etc/firejail/free*.profile`
41UID=`id -u` 41echo "TESTING: small number of default profiles installed in /etc"
42if [ -d "/run/user/$UID" ]; then
43 PROFILES=`ls /etc/firejail/*.profile`
44 echo "TESTING: default profiles installed in /etc"
45else
46 PROFILES=`ls /etc/firejail/transmission*.profile /etc/firejail/fi*.profile /etc/firejail/fl*.profile /etc/firejail/free*.profile`
47 echo "TESTING: small number of default profiles installed in /etc"
48fi
49 42
50for PROFILE in $PROFILES 43for PROFILE in $PROFILES
51do 44do