X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-fileio.c;h=eb4fbc91d2dcd2dc50463185ccc99d78c78ca1fd;hp=3511f3a3a425f35369d67be71af8dfbe784bbf1f;hb=5fba7bbfa47ef5c03a28000252d06ec82405d461;hpb=442e00839e4fc3c11506f5c8a9477b465865aecc

diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index 3511f3a3a..eb4fbc91d 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -27,6 +27,8 @@
 #include "fileio.h"
 #include "strv.h"
 #include "env-util.h"
+#include "def.h"
+#include "ctype.h"
 
 static void test_parse_env_file(void) {
         char    t[] = "/tmp/test-fileio-in-XXXXXX",
@@ -39,7 +41,9 @@ static void test_parse_env_file(void) {
         char **i;
         unsigned k;
 
-        assert_se(mktemp(p));
+        fd = mkstemp(p);
+        assert_se(fd >= 0);
+        close(fd);
 
         fd = mkostemp(t, O_CLOEXEC);
         assert_se(fd >= 0);
@@ -74,16 +78,16 @@ static void test_parse_env_file(void) {
         STRV_FOREACH(i, a)
                 log_info("Got: <%s>", *i);
 
-        assert_se(streq(a[0], "one=BAR"));
-        assert_se(streq(a[1], "two=bar"));
-        assert_se(streq(a[2], "three=333\nxxxx"));
-        assert_se(streq(a[3], "four=44\"44"));
-        assert_se(streq(a[4], "five=55\'55FIVEcinco"));
-        assert_se(streq(a[5], "six=seis sechs sis"));
-        assert_se(streq(a[6], "seven=sevenval#nocomment"));
-        assert_se(streq(a[7], "eight=eightval #nocomment"));
-        assert_se(streq(a[8], "export nine=nineval"));
-        assert_se(streq(a[9], "ten="));
+        assert_se(streq_ptr(a[0], "one=BAR"));
+        assert_se(streq_ptr(a[1], "two=bar"));
+        assert_se(streq_ptr(a[2], "three=333\nxxxx"));
+        assert_se(streq_ptr(a[3], "four=44\"44"));
+        assert_se(streq_ptr(a[4], "five=55\'55FIVEcinco"));
+        assert_se(streq_ptr(a[5], "six=seis sechs sis"));
+        assert_se(streq_ptr(a[6], "seven=sevenval#nocomment"));
+        assert_se(streq_ptr(a[7], "eight=eightval #nocomment"));
+        assert_se(streq_ptr(a[8], "export nine=nineval"));
+        assert_se(streq_ptr(a[9], "ten="));
         assert_se(a[10] == NULL);
 
         strv_env_clean_log(a, "test");
@@ -150,7 +154,9 @@ static void test_parse_multiline_env_file(void) {
         _cleanup_strv_free_ char **a = NULL, **b = NULL;
         char **i;
 
-        assert_se(mktemp(p));
+        fd = mkstemp(p);
+        assert_se(fd >= 0);
+        close(fd);
 
         fd = mkostemp(t, O_CLOEXEC);
         assert_se(fd >= 0);
@@ -179,9 +185,9 @@ static void test_parse_multiline_env_file(void) {
         STRV_FOREACH(i, a)
                 log_info("Got: <%s>", *i);
 
-        assert_se(streq(a[0], "one=BAR    VAR\tGAR"));
-        assert_se(streq(a[1], "two=bar    var\tgar"));
-        assert_se(streq(a[2], "tri=bar     var \tgar "));
+        assert_se(streq_ptr(a[0], "one=BAR    VAR\tGAR"));
+        assert_se(streq_ptr(a[1], "two=bar    var\tgar"));
+        assert_se(streq_ptr(a[2], "tri=bar     var \tgar "));
         assert_se(a[3] == NULL);
 
         r = write_env_file(p, a);
@@ -230,8 +236,8 @@ static void test_executable_is_script(void) {
 }
 
 static void test_status_field(void) {
-        _cleanup_free_ char *t = NULL, *p = NULL, *s = NULL;
-        unsigned long long total, buffers;
+        _cleanup_free_ char *t = NULL, *p = NULL, *s = NULL, *z = NULL;
+        unsigned long long total = 0, buffers = 0;
         int r;
 
         assert_se(get_status_field("/proc/self/status", "\nThreads:", &t) == 0);
@@ -239,23 +245,60 @@ static void test_status_field(void) {
         assert_se(streq(t, "1"));
 
         r = get_status_field("/proc/meminfo", "MemTotal:", &p);
-        if (r == -ENOENT)
-                return;
-        assert(r == 0);
-        puts(p);
-        assert_se(safe_atollu(p, &total) == 0);
+        if (r != -ENOENT) {
+                assert(r == 0);
+                puts(p);
+                assert_se(safe_atollu(p, &total) == 0);
+        }
+
+        r = get_status_field("/proc/meminfo", "\nBuffers:", &s);
+        if (r != -ENOENT) {
+                assert(r == 0);
+                puts(s);
+                assert_se(safe_atollu(s, &buffers) == 0);
+        }
 
-        assert_se(get_status_field("/proc/meminfo", "\nBuffers:", &s) == 0);
-        puts(s);
-        assert_se(safe_atollu(s, &buffers) == 0);
+        if (p && t)
+                assert(buffers < total);
 
-        assert(buffers < total);
+        /* Seccomp should be a good test for field full of zeros. */
+        r = get_status_field("/proc/meminfo", "\nSeccomp:", &z);
+        if (r != -ENOENT) {
+                assert(r == 0);
+                puts(z);
+                assert_se(safe_atollu(z, &buffers) == 0);
+        }
+}
+
+static void test_capeff(void) {
+        int pid, p;
+
+        for (pid = 0; pid < 2; pid++) {
+                _cleanup_free_ char *capeff = NULL;
+                int r;
+
+                r = get_process_capeff(0, &capeff);
+                log_info("capeff: '%s' (r=%d)", capeff, r);
+
+                if (r == -ENOENT || r == -EPERM)
+                        return;
+
+                assert(r == 0);
+                assert(*capeff);
+                p = capeff[strspn(capeff, DIGITS "abcdefABCDEF")];
+                assert(!p || isspace(p));
+        }
 }
 
 int main(int argc, char *argv[]) {
+        log_parse_environment();
+        log_open();
+
         test_parse_env_file();
         test_parse_multiline_env_file();
         test_executable_is_script();
         test_status_field();
+        test_capeff();
+
         return 0;
 }