testing

4 files changed, 6 insertions, 138 deletions

diff --git a/gcov.sh b/gcov.sh
index 8fb4a9a8d..6fa03f557 100755
--- a/gcov.sh
+++ b/gcov.sh
@@ -6,22 +6,17 @@ gcov_init() {
         firemon --help > /dev/null
         /usr/lib/firejail/fnet --help > /dev/null
         /usr/lib/firejail/fseccomp --help > /dev/null
-        /usr/lib/firejail/ftee --help > /dev/null
-        /usr/lib/firejail/fcopy --help > /dev/null
-        /usr/lib/firejail/fldd --help > /dev/null
         firecfg --help > /dev/null
 
         /usr/lib/firejail/fnetfilter --help > /dev/null
         /usr/lib/firejail/fsec-print --help > /dev/null
         /usr/lib/firejail/fsec-optimize --help > /dev/null
-        /usr/lib/firejail/faudit --help > /dev/null
-        /usr/lib/firejail/fbuilder --help > /dev/null
 
         sudo chown $USER:$USER `find .`
 }
 
 generate() {
-        lcov -q --capture -d src/firejail -d src/firemon -d src/faudit -d src/fbuilder -d  src/fcopy -d  src/fnetfilter -d src/fsec-print -d src/fsec-optimize -d src/fseccomp -d src/fnet -d src/ftee -d src/lib -d src/firecfg -d src/fldd --output-file gcov-file-new
+        lcov -q --capture -d src/firejail -d src/firemon -d src/fnetfilter -d src/fsec-print -d src/fsec-optimize -d src/fseccomp -d src/fnet -d src/lib -d src/firecfg --output-file gcov-file-new
         lcov --add-tracefile gcov-file-old --add-tracefile gcov-file-new  --output-file gcov-file
         rm -fr gcov-dir
         genhtml -q gcov-file --output-directory gcov-dir
@@ -32,7 +27,9 @@ generate() {
 
 
 gcov_init
-lcov -q --capture -d src/firejail -d src/firemon -d src/faudit -d src/fbuilder -d  src/fcopy -d  src/fnetfilter -d src/fsec-print -d src/fsec-optimize -d src/fseccomp -d src/fnet -d src/ftee -d src/lib -d src/firecfg -d src/fldd  --output-file gcov-file-old
+lcov -q --capture -d src/firejail -d src/firemon \
+        -d  src/fnetfilter -d src/fsec-print -d src/fsec-optimize -d src/fseccomp \
+        -d src/fnet -d src/lib -d src/firecfg --output-file gcov-file-old
 
 #make test-utils
 #generate
@@ -44,10 +41,8 @@ lcov -q --capture -d src/firejail -d src/firemon -d src/faudit -d src/fbuilder -
 make test-root
 generate
 sleep 2
+exit
 
-make test-chroot
-generate
-sleep 2
 
 make test-network
 generate
@@ -57,22 +52,10 @@ make test-stress
 generate
 sleep 2
 
-make test-ssh
-generate
-sleep 2
-
 make test-appimage
 generate
 sleep 2
 
-make test-overlay
-generate
-sleep 2
-
-make test-fcopy
-generate
-sleep 2
-
 make test-profiles
 generate
 sleep 2
@@ -93,14 +76,6 @@ make test-apps
 generate
 sleep 2
 
-make test-apps-x11
-generate
-sleep 2
-
-make test-apps-x11-xorg
-generate
-sleep 2
-
 make test-filters
 generate
 sleep 2
diff --git a/src/include/ldd_utils.h b/src/include/ldd_utils.h
deleted file mode 100644
index 28f5be7bf..000000000
--- a/src/include/ldd_utils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2014-2018 Firejail Authors
- *
- * This file is part of firejail project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef LDD_UTILS_H
-#define LDD_UTILS_H
-
-#include "../include/common.h"
-#include <elf.h>
-
-#ifdef __LP64__
-#define Elf_Ehdr Elf64_Ehdr
-#define Elf_Phdr Elf64_Phdr
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Dyn Elf64_Dyn
-#else
-#define Elf_Ehdr Elf32_Ehdr
-#define Elf_Phdr Elf32_Phdr
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Dyn Elf32_Dyn
-#endif
-
-extern const char * const default_lib_paths[];
-
-// return 1 if this is a 64 bit program/library
-int is_lib_64(const char *exe);
-
-
-
-#endif
\ No newline at end of file
diff --git a/src/lib/ldd_utils.c b/src/lib/ldd_utils.c
deleted file mode 100644
index b8a7aeed2..000000000
--- a/src/lib/ldd_utils.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2014-2018 Firejail Authors
- *
- * This file is part of firejail project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "../include/ldd_utils.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-const char * const default_lib_paths[] = {
-        "/usr/lib/x86_64-linux-gnu",    // Debian & friends
-        "/lib/x86_64-linux-gnu",                // CentOS, Fedora
-        "/usr/lib",
-        "/lib",
-        "/lib64",
-        LIBDIR,
-        "/usr/local/lib",
-        "/usr/lib/x86_64-linux-gnu/mesa", // libGL.so is sometimes a symlink into this directory
-        "/usr/lib/x86_64-linux-gnu/mesa-egl", // libGL.so is sometimes a symlink into this directory
-//    "/usr/lib/x86_64-linux-gnu/plasma-discover",
-        NULL
-};
-
-// return 1 if this is a 64 bit program/library
-int is_lib_64(const char *exe) {
-        int retval = 0;
-        int fd = open(exe, O_RDONLY);
-        if (fd < 0)
-                return 0;
-
-        unsigned char buf[EI_NIDENT];
-        ssize_t len = 0;
-        while (len < EI_NIDENT) {
-                ssize_t sz = read(fd, buf, EI_NIDENT);
-                if (sz <= 0)
-                        goto doexit;
-                len += sz;
-        }
-
-        if (buf[EI_CLASS] == ELFCLASS64)
-                retval = 1;
-
-doexit:
-        close(fd);
-        return retval;
-}
diff --git a/test/root/root.sh b/test/root/root.sh
index a20142c5f..2760a5a61 100755
--- a/test/root/root.sh
+++ b/test/root/root.sh
@@ -12,6 +12,7 @@ if [ "$?" -eq 0 ];
 then
         echo "TESTING: firecfg (test/root/firecfg.exp)"
         mv /home/netblue/.local/share/applications /home/netblue/.local/share/applications-store
+        rm /etc/firejail/firejail.users
         ./firecfg.exp
         mv /home/netblue/.local/share/applications-store /home/netblue/.local/share/applications
 else