tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / execve.c

diff --git a/tests/execve.c b/tests/execve.c
index 9c0cfe0121a74ce827bf27c0d34cca65010feb61..da3bc5200c0c41b38d121d2b4c9a300d577d4fca 100644 (file)
--- a/tests/execve.c
+++ b/tests/execve.c
@@ -2,6 +2,7 @@
  * This file is part of execve strace test.
  *
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +29,6 @@
  */
 
 #include "tests.h"
-#include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -60,66 +60,81 @@ main(void)
        execve(FILENAME, tail_argv, tail_envp);
        printf("execve(\"%s\""
               ", [\"%s\", \"%s\", \"%s\", %p, %p, %p, ???]"
-#ifdef VERBOSE_EXECVE
+#if VERBOSE
               ", [\"%s\", \"%s\", %p, %p, %p, ???]"
 #else
-              ", [/* 5 vars, unterminated */]"
+              ", %p /* 5 vars, unterminated */"
 #endif
-              ") = -1 %s (%m)\n",
+              ") = -1 ENOENT (%m)\n",
               Q_FILENAME, q_argv[0], q_argv[1], q_argv[2],
-              argv[3], argv[4], argv[5],
-#ifdef VERBOSE_EXECVE
-              q_envp[0], q_envp[1], envp[2], envp[3], envp[4],
+              argv[3], argv[4], argv[5]
+#if VERBOSE
+              , q_envp[0], q_envp[1], envp[2], envp[3], envp[4]
+#else
+              , tail_envp
 #endif
-              errno == ENOSYS ? "ENOSYS" : "ENOENT");
+              );
 
        tail_argv[ARRAY_SIZE(q_argv)] = NULL;
        tail_envp[ARRAY_SIZE(q_envp)] = NULL;
 
        execve(FILENAME, tail_argv, tail_envp);
        printf("execve(\"%s\", [\"%s\", \"%s\", \"%s\"]"
-#ifdef VERBOSE_EXECVE
+#if VERBOSE
               ", [\"%s\", \"%s\"]"
 #else
-              ", [/* 2 vars */]"
+              ", %p /* 2 vars */"
 #endif
-              ") = -1 %s (%m)\n",
-              Q_FILENAME, q_argv[0], q_argv[1], q_argv[2],
-#ifdef VERBOSE_EXECVE
-              q_envp[0], q_envp[1],
+              ") = -1 ENOENT (%m)\n",
+              Q_FILENAME, q_argv[0], q_argv[1], q_argv[2]
+#if VERBOSE
+              , q_envp[0], q_envp[1]
+#else
+              , tail_envp
 #endif
-              errno == ENOSYS ? "ENOSYS" : "ENOENT");
+              );
 
        execve(FILENAME, tail_argv + 2, tail_envp + 1);
        printf("execve(\"%s\", [\"%s\"]"
-#ifdef VERBOSE_EXECVE
+#if VERBOSE
               ", [\"%s\"]"
 #else
-              ", [/* 1 var */]"
+              ", %p /* 1 var */"
 #endif
-              ") = -1 %s (%m)\n",
-              Q_FILENAME, q_argv[2],
-#ifdef VERBOSE_EXECVE
-              q_envp[1],
+              ") = -1 ENOENT (%m)\n",
+              Q_FILENAME, q_argv[2]
+#if VERBOSE
+              , q_envp[1]
+#else
+              , tail_envp + 1
 #endif
-              errno == ENOSYS ? "ENOSYS" : "ENOENT");
+              );
 
-       char **const empty = tail_alloc(sizeof(*empty));
+       TAIL_ALLOC_OBJECT_CONST_PTR(char *, empty);
+       char **const efault = empty + 1;
        *empty = NULL;
 
        execve(FILENAME, empty, empty);
        printf("execve(\"%s\", []"
-#ifdef VERBOSE_EXECVE
+#if VERBOSE
               ", []"
 #else
-              ", [/* 0 vars */]"
+              ", %p /* 0 vars */"
 #endif
-              ") = -1 %s (%m)\n",
-              Q_FILENAME, errno == ENOSYS ? "ENOSYS" : "ENOENT");
+              ") = -1 ENOENT (%m)\n", Q_FILENAME
+#if !VERBOSE
+              , empty
+#endif
+              );
+
+       char *const str_a = tail_alloc(DEFAULT_STRLEN + 2);
+       fill_memory_ex(str_a, DEFAULT_STRLEN + 1, '0', 10);
+       str_a[DEFAULT_STRLEN + 1] = '\0';
+
+       char *const str_b = tail_alloc(DEFAULT_STRLEN + 2);
+       fill_memory_ex(str_b, DEFAULT_STRLEN + 1, '_', 32);
+       str_b[DEFAULT_STRLEN + 1] = '\0';
 
-       char str_a[] = "012345678901234567890123456789012";
-       char str_b[] = "_abcdefghijklmnopqrstuvwxyz()[]{}";
-#define DEFAULT_STRLEN ((unsigned int) sizeof(str_a) - 2)
        char **const a = tail_alloc(sizeof(*a) * (DEFAULT_STRLEN + 2));
        char **const b = tail_alloc(sizeof(*b) * (DEFAULT_STRLEN + 2));
        unsigned int i;
@@ -133,44 +148,42 @@ main(void)
        printf("execve(\"%s\", [\"%.*s\"...", Q_FILENAME, DEFAULT_STRLEN, a[0]);
        for (i = 1; i < DEFAULT_STRLEN; ++i)
                printf(", \"%s\"", a[i]);
-#ifdef VERBOSE_EXECVE
+#if VERBOSE
        printf(", \"%s\"", a[i]);
 #else
        printf(", ...");
 #endif
-#ifdef VERBOSE_EXECVE
+#if VERBOSE
        printf("], [\"%.*s\"...", DEFAULT_STRLEN, b[0]);
        for (i = 1; i <= DEFAULT_STRLEN; ++i)
                printf(", \"%s\"", b[i]);
+       printf("]");
 #else
-       printf("], [/* %u vars */", DEFAULT_STRLEN + 1);
+       printf("], %p /* %u vars */", b, DEFAULT_STRLEN + 1);
 #endif
-       printf("]) = -1 %s (%m)\n", errno == ENOSYS ? "ENOSYS" : "ENOENT");
+       printf(") = -1 ENOENT (%m)\n");
 
        execve(FILENAME, a + 1, b + 1);
        printf("execve(\"%s\", [\"%s\"", Q_FILENAME, a[1]);
        for (i = 2; i <= DEFAULT_STRLEN; ++i)
                printf(", \"%s\"", a[i]);
-#ifdef VERBOSE_EXECVE
+#if VERBOSE
        printf("], [\"%s\"", b[1]);
        for (i = 2; i <= DEFAULT_STRLEN; ++i)
                printf(", \"%s\"", b[i]);
+       printf("]");
 #else
-       printf("], [/* %d vars */", DEFAULT_STRLEN);
+       printf("], %p /* %d vars */", b + 1, DEFAULT_STRLEN);
 #endif
-       printf("]) = -1 %s (%m)\n", errno == ENOSYS ? "ENOSYS" : "ENOENT");
-
-       const void * const efault = tail_alloc(0);
+       printf(") = -1 ENOENT (%m)\n");
 
        execve(FILENAME, (char **) tail_argv[ARRAY_SIZE(q_argv)], efault);
-       printf("execve(\"%s\", NULL, %p"
-              ") = -1 %s (%m)\n",
-              Q_FILENAME, efault, errno == ENOSYS ? "ENOSYS" : "ENOENT");
+       printf("execve(\"%s\", NULL, %p) = -1 ENOENT (%m)\n",
+              Q_FILENAME, efault);
 
        execve(FILENAME, efault, NULL);
-       printf("execve(\"%s\", %p, NULL"
-              ") = -1 %s (%m)\n",
-              Q_FILENAME, efault, errno == ENOSYS ? "ENOSYS" : "ENOENT");
+       printf("execve(\"%s\", %p, NULL) = -1 ENOENT (%m)\n",
+              Q_FILENAME, efault);
 
        return 0;
 }