diff options
author | netblue30 <netblue30@yahoo.com> | 2016-04-24 06:49:25 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-04-24 06:49:25 -0400 |
commit | 46113d48c480249363081ce75086d275948bd644 (patch) | |
tree | 5c78867f8f9cdc0900d8b855d5cfa9ca5e4ae34f | |
parent | testing (diff) | |
download | firejail-46113d48c480249363081ce75086d275948bd644.tar.gz firejail-46113d48c480249363081ce75086d275948bd644.tar.zst firejail-46113d48c480249363081ce75086d275948bd644.zip |
testing
-rw-r--r-- | Makefile.in | 5 | ||||
-rwxr-xr-x | test/firemon/firemon.sh | 10 | ||||
-rwxr-xr-x | test/utils/caps.exp (renamed from test/firemon/caps.exp) | 0 | ||||
-rw-r--r-- | test/utils/caps1.profile (renamed from test/firemon/caps1.profile) | 0 | ||||
-rw-r--r-- | test/utils/caps2.profile (renamed from test/firemon/caps2.profile) | 0 | ||||
-rwxr-xr-x | test/utils/seccomp.exp (renamed from test/firemon/seccomp.exp) | 0 | ||||
-rwxr-xr-x | test/utils/utils.sh | 6 |
7 files changed, 7 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 4f777583c..d33ff0aff 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -277,14 +277,11 @@ test-apps: | |||
277 | test-apps-x11: | 277 | test-apps-x11: |
278 | cd test/apps-x11; ./apps-x11.sh | grep TESTING | 278 | cd test/apps-x11; ./apps-x11.sh | grep TESTING |
279 | 279 | ||
280 | test-firemon: | ||
281 | cd test/firemon; ./firemon.sh | grep TESTING | ||
282 | |||
283 | test-utils: | 280 | test-utils: |
284 | cd test/utils; ./utils.sh | grep TESTING | 281 | cd test/utils; ./utils.sh | grep TESTING |
285 | 282 | ||
286 | test-environment: | 283 | test-environment: |
287 | cd test/environment; ./environment.sh | grep TESTING | 284 | cd test/environment; ./environment.sh | grep TESTING |
288 | 285 | ||
289 | test: test-profiles test-utils test-environment test-apps test-apps-x11 test-firemon | 286 | test: test-profiles test-utils test-environment test-apps test-apps-x11 |
290 | echo "TEST COMPLETE" | 287 | echo "TEST COMPLETE" |
diff --git a/test/firemon/firemon.sh b/test/firemon/firemon.sh deleted file mode 100755 index edd548526..000000000 --- a/test/firemon/firemon.sh +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #!/bin/bash | ||
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
5 | |||
6 | echo "TESTING: firemon --seccomp (test/firemon/seccomp.exp)" | ||
7 | ./seccomp.exp | ||
8 | |||
9 | echo "TESTING: firemon --caps (test/firemon/caps.exp)" | ||
10 | ./caps.exp | ||
diff --git a/test/firemon/caps.exp b/test/utils/caps.exp index ab1067921..ab1067921 100755 --- a/test/firemon/caps.exp +++ b/test/utils/caps.exp | |||
diff --git a/test/firemon/caps1.profile b/test/utils/caps1.profile index e14655b2e..e14655b2e 100644 --- a/test/firemon/caps1.profile +++ b/test/utils/caps1.profile | |||
diff --git a/test/firemon/caps2.profile b/test/utils/caps2.profile index cb2258c52..cb2258c52 100644 --- a/test/firemon/caps2.profile +++ b/test/utils/caps2.profile | |||
diff --git a/test/firemon/seccomp.exp b/test/utils/seccomp.exp index a318e39b1..a318e39b1 100755 --- a/test/firemon/seccomp.exp +++ b/test/utils/seccomp.exp | |||
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index 8c53feab3..23cbc6b35 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -69,3 +69,9 @@ rm -f index.html* | |||
69 | ./trace.exp | 69 | ./trace.exp |
70 | rm -f index.html* | 70 | rm -f index.html* |
71 | 71 | ||
72 | echo "TESTING: firemon --seccomp (test/utils/seccomp.exp)" | ||
73 | ./seccomp.exp | ||
74 | |||
75 | echo "TESTING: firemon --caps (test/ustil/caps.exp)" | ||
76 | ./caps.exp | ||
77 | |||