testing

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:
 test-apps-x11:
         cd test/apps-x11; ./apps-x11.sh | grep TESTING
 
-test-firemon:
-        cd test/firemon; ./firemon.sh | grep TESTING
-
 test-utils:
         cd test/utils; ./utils.sh | grep TESTING
 
 test-environment:
         cd test/environment; ./environment.sh | grep TESTING
 
-test: test-profiles test-utils  test-environment test-apps test-apps-x11 test-firemon
+test: test-profiles test-utils  test-environment test-apps test-apps-x11
         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 @@
-#!/bin/bash
-# This file is part of Firejail project
-# Copyright (C) 2014-2016 Firejail Authors
-# License GPL v2
-
-echo "TESTING: firemon --seccomp (test/firemon/seccomp.exp)"
-./seccomp.exp
-
-echo "TESTING: firemon --caps (test/firemon/caps.exp)"
-./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*
 ./trace.exp
 rm -f index.html*
 
+echo "TESTING: firemon --seccomp (test/utils/seccomp.exp)"
+./seccomp.exp
+
+echo "TESTING: firemon --caps (test/ustil/caps.exp)"
+./caps.exp
+