tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / ioctl.c

diff --git a/tests/ioctl.c b/tests/ioctl.c
index bd3e37d0a6c29d8beb351ba2230651e76b0462b3..3c666b0d64ccb9e98aa55fe90722f98bb22ecb74 100644 (file)
--- a/tests/ioctl.c
+++ b/tests/ioctl.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * 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
@@ -25,10 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#include "tests.h"
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -56,7 +54,7 @@
  && defined EV_KEY
 
 int
-main(void )
+main(void)
 {
        uint64_t data = 0;
 
@@ -64,36 +62,40 @@ main(void )
        struct termios tty;
        (void) ioctl(-1, TCGETS, &tty);
        printf("ioctl(-1, TCGETS, %p)"
-              " = -1 EBADF (Bad file descriptor)\n", &tty);
+              " = -1 EBADF (%m)\n", &tty);
 #endif
 
        (void) ioctl(-1, MMTIMER_GETRES, &data);
        printf("ioctl(-1, MMTIMER_GETRES, %p)"
-              " = -1 EBADF (Bad file descriptor)\n", &data);
+              " = -1 EBADF (%m)\n", &data);
 
        (void) ioctl(-1, VIDIOC_ENUMINPUT, 0);
-       printf("ioctl(-1, VIDIOC_ENUMINPUT, 0)"
-              " = -1 EBADF (Bad file descriptor)\n");
+       printf("ioctl(-1, VIDIOC_ENUMINPUT, NULL)"
+              " = -1 EBADF (%m)\n");
 
        (void) ioctl(-1, HIDIOCGVERSION, &data);
        printf("ioctl(-1, HIDIOCGRDESCSIZE or HIDIOCGVERSION, %p)"
-              " = -1 EBADF (Bad file descriptor)\n", &data);
+              " = -1 EBADF (%m)\n", &data);
 
        (void) ioctl(-1, HIDIOCGPHYS(8), &data);
        printf("ioctl(-1, HIDIOCGPHYS(8), %p)"
-              " = -1 EBADF (Bad file descriptor)\n", &data);
+              " = -1 EBADF (%m)\n", &data);
 
        (void) ioctl(-1, EVIOCGBIT(EV_KEY, 8), &data);
        printf("ioctl(-1, EVIOCGBIT(EV_KEY, 8), %p)"
-              " = -1 EBADF (Bad file descriptor)\n", &data);
+              " = -1 EBADF (%m)\n", &data);
 
        (void) ioctl(-1, _IOR('M', 13, int), &data);
        printf("ioctl(-1, MIXER_READ(13) or OTPSELECT, [MTD_OTP_OFF])"
-              " = -1 EBADF (Bad file descriptor)\n");
+              " = -1 EBADF (%m)\n");
+
+       (void) ioctl(-1, _IOC(_IOC_WRITE, 0xde, 0, 0), (kernel_ulong_t) -1ULL);
+       printf("ioctl(-1, _IOC(_IOC_WRITE, 0xde, 0, 0), %#lx)"
+              " = -1 EBADF (%m)\n", -1UL);
 
        (void) ioctl(-1, _IOR(0xde, 0xad, data), &data);
-       printf("ioctl(-1, _IOC(_IOC_READ, 0xde, 0xad, 0x08), %p)"
-              " = -1 EBADF (Bad file descriptor)\n", &data);
+       printf("ioctl(-1, _IOC(_IOC_READ, 0xde, 0xad, 0x8), %p)"
+              " = -1 EBADF (%m)\n", &data);
 
        puts("+++ exited with 0 +++");
        return 0;
@@ -101,10 +103,8 @@ main(void )
 
 #else
 
-int
-main(void )
-{
-       return 77;
-}
+SKIP_MAIN_UNDEFINED("MMTIMER_GETRES && VIDIOC_ENUMINPUT"
+                   " && HIDIOCGVERSION && HIDIOCGPHYS"
+                   " && EVIOCGBIT && EV_KEY")
 
 #endif