Changes in tests/meta/dumpable.cfa [0521a1a:10b3fc3]

File:

• tests/meta/dumpable.cfa (modified) (4 diffs)

tests/meta/dumpable.cfa

@@ -14 +14 @@
 //
 
+#include <limits.h>
 #include <errno.h>
-#include <limits.h>
-#include <string.h>
 
 #include <fstream.hfa>
 
 extern "C" {
-        #include <fcntl.h>
-        #include <unistd.h>
         #include <sys/prctl.h>
         #include <sys/resource.h>
         #include <sys/statvfs.h>
-        #include <sys/stat.h>
-        #include <sys/types.h>
+        #include <unistd.h>
 }
 
@@ -76 +72 @@
         }
 
-        uint64_t avail = buf.f_bavail;
-        avail *= buf.f_bsize;
-        if(avail < 536870912_l64u) {
-                serr | "Available diskspace is less than ~500Mb: " | avail;
+        if((buf.f_bsize * buf.f_bavail) < 536870912) {
+                serr | "Available diskspace is less than ~500Mb: " | (buf.f_bsize * buf.f_bavail);
         }
 
@@ -106 +100 @@
 }
 
-void check_core_pattern() {
-        int ret;
-        int cp = open("/proc/sys/kernel/core_pattern", 0, O_RDONLY);
-        if(cp < 0) {
-                perror("open(/proc/sys/kernel/core_pattern, O_RDONLY) error");
-                return;
-        }
-
-        try {
-                const char * expected = "core\n";
-                const int sz = sizeof("core\n");
-                char buf[512];
-                ret = read(cp, buf, 512);
-                if(ret < 0) {
-                        perror("first core pattern read error");
-                        return;
-                }
-                ret = strncmp(expected, buf, sz - 1);
-                if(ret != 0) {
-                        serr | "/proc/sys/kernel/core_pattern does not contain 'core', was:" | nl | nl | buf | nl
-                             | "Test script expect cores files to be dumped with name 'core' in current working directory." | nl
-                             | "Apport is not supported, it should be deactivated in /etc/default/apport for the test suite to work with core dumps.";
-
-                        return;
-                }
-        }
-        finally {
-                ret = close(cp);
-                if(ret < 0) perror("close(/proc/sys/kernel/core_pattern) error");
-        }
-
-}
-
 int main() {
         check_ulimit();
@@ -150 +111 @@
         check_dumpflag();
 
-        check_core_pattern();
-
         sout | "Done";
 }