avoid having some daemon related tests Linux specific

diff --git a/src/dbaccess.c b/src/dbaccess.c
index c02fb74f21c1913e055489ea694972d6442d609b..f99c4d81f8963c3f01655d9af0a13d164cc3fd72 100644 (file)
--- a/src/dbaccess.c
+++ b/src/dbaccess.c
@@ -3,6 +3,7 @@
 #include "fs.h"
 #include "dbaccess.h"
 
+/* TODO: tests */
 int importlegacydb(const char *iface, const char *dirname)
 {
        DATA data;
@@ -29,6 +30,7 @@ int importlegacydb(const char *iface, const char *dirname)
        return 1;
 }
 
+/* TODO: tests */
 int insertlegacydata(DATA *data, const char *iface)
 {
        int i, year;

diff --git a/src/ifinfo.c b/src/ifinfo.c
index ccc839b695c12367a8d02f2745db6328971907a0..a8f073cdd9391450a3465b7412fc8ea7009e4105 100644 (file)
--- a/src/ifinfo.c
+++ b/src/ifinfo.c
@@ -19,37 +19,39 @@ int getifinfo(const char *iface)
                strncpy_nt(inface, iface, 32);
        }
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(CHECK_VNSTAT)
        /* try getting interface info from /proc */
-       if (readproc(inface)!=1) {
+       if (readproc(inface)==1) {
+               ifinfo.timestamp = time(NULL);
+               return 1;
+       } else {
                if (debug)
                        printf("Failed to use %s as source.\n", PROCNETDEV);
+       }
 
-               /* try getting interface info from /sys */
-               if (readsysclassnet(inface)!=1) {
-                       snprintf(errorstring, 1024, "Unable to get interface \"%s\" statistics.", inface);
-                       printe(PT_Error);
-                       return 0;
-               }
+       /* try getting interface info from /sys */
+       if (readsysclassnet(inface)==1) {
+               ifinfo.timestamp = time(NULL);
+               return 1;
        }
+
 #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)  || defined(__FreeBSD_kernel__)
-       if (readifaddrs(inface)!=1) {
-               snprintf(errorstring, 1024, "Unable to get interface \"%s\" statistics.", inface);
-               printe(PT_Error);
-               return 0;
+       if (readifaddrs(inface)==1) {
+               ifinfo.timestamp = time(NULL);
+               return 1;
        }
-#else
-       return 0;
 #endif
-       ifinfo.timestamp = time(NULL);
-       return 1;
+
+       snprintf(errorstring, 1024, "Unable to get interface \"%s\" statistics.", inface);
+       printe(PT_Error);
+       return 0;
 }
 
 int getiflist(char **ifacelist, int showspeed)
 {
        uint32_t speed;
        char temp[64];
-#if defined(__linux__)
+#if defined(__linux__) || defined(CHECK_VNSTAT)
        char interface[32];
        FILE *fp;
        DIR *dp;
@@ -66,7 +68,7 @@ int getiflist(char **ifacelist, int showspeed)
        }
        *ifacelist[0] = '\0';
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(CHECK_VNSTAT)
        if ((fp=fopen(PROCNETDEV, "r"))!=NULL) {
 
                /* make list of interfaces */

diff --git a/tests/daemon_tests.c b/tests/daemon_tests.c
index f0a427701f7ce2f35dd4e7d6ca50fcd1d07e27d6..2edf78d00f68fb704bb2df55dbc53c7b62bea0a2 100644 (file)
--- a/tests/daemon_tests.c
+++ b/tests/daemon_tests.c
@@ -20,7 +20,6 @@ END_TEST
 START_TEST(addinterfaces_does_nothing_with_no_files)
 {
        DSTATE s;
-       linuxonly;
 
        defaultcfg();
        initdstate(&s);
@@ -36,7 +35,6 @@ START_TEST(addinterfaces_adds_interfaces)
 {
        int ret;
        DSTATE s;
-       linuxonly;
 
        defaultcfg();
        initdstate(&s);
@@ -70,7 +68,6 @@ START_TEST(addinterfaces_adds_only_new_interfaces)
 {
        int ret;
        DSTATE s;
-       linuxonly;
 
        defaultcfg();
        initdstate(&s);
@@ -130,7 +127,6 @@ START_TEST(addinterfaces_adds_to_cache_when_running)
 {
        int ret;
        DSTATE s;
-       linuxonly;
 
        defaultcfg();
        initdstate(&s);
@@ -198,8 +194,6 @@ START_TEST(preparedatabases_exits_with_no_database_dir)
 {
        DSTATE s;
 
-       linuxonly_exit;
-
        defaultcfg();
        initdstate(&s);
        suppress_output();
@@ -213,8 +207,6 @@ START_TEST(preparedatabases_exits_with_no_databases)
 {
        DSTATE s;
 
-       linuxonly_exit;
-
        defaultcfg();
        initdstate(&s);
        suppress_output();
@@ -230,8 +222,6 @@ START_TEST(preparedatabases_exits_with_no_databases_and_noadd)
 {
        DSTATE s;
 
-       linuxonly_exit;
-
        defaultcfg();
        initdstate(&s);
        s.noadd = 1;
@@ -249,8 +239,6 @@ START_TEST(preparedatabases_with_no_databases_creates_databases)
        int ret;
        DSTATE s;
 
-       linuxonly;
-
        defaultcfg();
        initdstate(&s);
        suppress_output();
@@ -460,10 +448,6 @@ END_TEST
 
 START_TEST(processdatacache_can_process_things)
 {
-       /* ifinfo needs to be faked and that's currently
-          supported only in Linux */
-       linuxonly;
-
        int ret;
        DSTATE s;
        defaultcfg();
@@ -685,8 +669,6 @@ START_TEST(interfacechangecheck_with_no_interfaces)
 {
        DSTATE s;
 
-       linuxonly;
-
        initdstate(&s);
        ck_assert_int_eq(remove_directory(TESTDIR), 1);
        interfacechangecheck(&s);
@@ -699,8 +681,6 @@ START_TEST(interfacechangecheck_with_empty_cache)
 {
        DSTATE s;
 
-       linuxonly;
-
        initdstate(&s);
        ck_assert_int_eq(remove_directory(TESTDIR), 1);
        fake_proc_net_dev("w", "ethsomething", 1, 2, 3, 4);
@@ -718,8 +698,6 @@ START_TEST(interfacechangecheck_with_no_changes_in_iflist)
        uint32_t ifhash;
        char *ifacelist;
 
-       linuxonly;
-
        initdstate(&s);
        ck_assert_int_eq(remove_directory(TESTDIR), 1);
        fake_proc_net_dev("w", "ethsomething", 1, 2, 3, 4);
@@ -736,8 +714,6 @@ END_TEST
 
 START_TEST(interfacechangecheck_with_filled_cache)
 {
-       linuxonly;
-
        int ret;
        DSTATE s;
        datacache *iterator;