diff options
author | netblue30 <netblue30@yahoo.com> | 2016-03-31 10:22:40 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-03-31 10:22:40 -0400 |
commit | 6eb481b4c5d7ebe56828107b23b8c7ffc16bd70e (patch) | |
tree | 1fd946d45623aa8fa97f0099b0882960ef89be7e | |
parent | testing (diff) | |
download | firejail-6eb481b4c5d7ebe56828107b23b8c7ffc16bd70e.tar.gz firejail-6eb481b4c5d7ebe56828107b23b8c7ffc16bd70e.tar.zst firejail-6eb481b4c5d7ebe56828107b23b8c7ffc16bd70e.zip |
testing
-rw-r--r-- | RELNOTES | 2 | ||||
-rw-r--r-- | platform/debian/conffiles | 4 | ||||
-rwxr-xr-x | test/private-whitelist.exp | 2 | ||||
-rwxr-xr-x | test/private_dir.exp | 4 | ||||
-rwxr-xr-x | test/private_dir_profile.exp | 6 |
5 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ | |||
1 | firejail (0.9.39) baseline; urgency=low | 1 | firejail (0.9.40-rc1) baseline; urgency=low |
2 | * added --nice option | 2 | * added --nice option |
3 | * added --x11 option | 3 | * added --x11 option |
4 | * added --x11=xpra option | 4 | * added --x11=xpra option |
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 267990a24..e628058c9 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -73,7 +73,7 @@ | |||
73 | /etc/firejail/firejail.config | 73 | /etc/firejail/firejail.config |
74 | /etc/firejail/qutebrowser.profile | 74 | /etc/firejail/qutebrowser.profile |
75 | /etc/firejail/flashpeak-slimjet.profile | 75 | /etc/firejail/flashpeak-slimjet.profile |
76 | /etc/firejail/ssh | 76 | /etc/firejail/ssh.profile |
77 | /etc/firejail/openbox | 77 | /etc/firejail/openbox.profile |
78 | /etc/firejail/disable-programs.inc | 78 | /etc/firejail/disable-programs.inc |
79 | /etc/firejail/disable-passwdmgr.inc | 79 | /etc/firejail/disable-passwdmgr.inc |
diff --git a/test/private-whitelist.exp b/test/private-whitelist.exp index f06415c52..7379241ef 100755 --- a/test/private-whitelist.exp +++ b/test/private-whitelist.exp | |||
@@ -28,7 +28,7 @@ sleep 1 | |||
28 | send -- "ls -a ~ | wc -l\r" | 28 | send -- "ls -a ~ | wc -l\r" |
29 | expect { | 29 | expect { |
30 | timeout {puts "TESTING ERROR 4\n";exit} | 30 | timeout {puts "TESTING ERROR 4\n";exit} |
31 | "4" | 31 | "5" |
32 | } | 32 | } |
33 | 33 | ||
34 | sleep 1 | 34 | sleep 1 |
diff --git a/test/private_dir.exp b/test/private_dir.exp index 95f89362a..9dfb2ea9f 100755 --- a/test/private_dir.exp +++ b/test/private_dir.exp | |||
@@ -42,8 +42,8 @@ expect { | |||
42 | send -- "ls -al | wc -l;pwd\r" | 42 | send -- "ls -al | wc -l;pwd\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 1\n";exit} | 44 | timeout {puts "TESTING ERROR 1\n";exit} |
45 | "5" {puts "normal system\n";} | 45 | "7" {puts "normal system\n";} |
46 | "4" {puts "OpenSUSE\n";} | 46 | "5" {puts "OpenSUSE\n";} |
47 | } | 47 | } |
48 | expect { | 48 | expect { |
49 | timeout {puts "TESTING ERROR 2\n";exit} | 49 | timeout {puts "TESTING ERROR 2\n";exit} |
diff --git a/test/private_dir_profile.exp b/test/private_dir_profile.exp index e6c01798e..5b38ad0bb 100755 --- a/test/private_dir_profile.exp +++ b/test/private_dir_profile.exp | |||
@@ -42,13 +42,13 @@ expect { | |||
42 | send -- "ls -al | wc -l;pwd\r" | 42 | send -- "ls -al | wc -l;pwd\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 1\n";exit} | 44 | timeout {puts "TESTING ERROR 1\n";exit} |
45 | "5" {puts "normal system\n";} | 45 | "7" {puts "normal system\n";} |
46 | "4" {puts "OpenSUSE\n";} | 46 | "5" {puts "OpenSUSE\n";} |
47 | } | 47 | } |
48 | expect { | 48 | expect { |
49 | timeout {puts "TESTING ERROR 2\n";exit} | 49 | timeout {puts "TESTING ERROR 2\n";exit} |
50 | "home" | 50 | "home" |
51 | } | 51 | } |
52 | 52 | ||
53 | puts "\n" | 53 | puts "\nall done\n" |
54 | 54 | ||