From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 30 Dec 2016 09:43:12 +0000 (+0000)
Subject: tests: do not use defs.h and syscall.h
X-Git-Tag: v4.16~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0b3f55b3b5fab2ff29e2b596f5e40f03a55e650;p=strace

tests: do not use defs.h and syscall.h

* tests/generate_scno.c: Include "tests.h", "sysent.h", <stdio.h>,
<string.h>, and <asm/unistd.h> instead of "defs.h" and "syscall.h".
* tests/ksysent.c: Likewise.
* tests/nsyscalls.c: Include "tests.h", "sysent.h", <errno.h>,
<stdio.h>, and <unistd.h> instead of "defs.h" and "syscall.h".
---

diff --git a/tests/generate_scno.c b/tests/generate_scno.c
index 1261420c..66e8036c 100644
--- a/tests/generate_scno.c
+++ b/tests/generate_scno.c
@@ -1,4 +1,6 @@
 /*
+ * Generate scno.h file.
+ *
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
@@ -25,8 +27,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "defs.h"
-#include "syscall.h"
+#include "tests.h"
+#include "sysent.h"
+#include <stdio.h>
+#include <string.h>
+#include <asm/unistd.h>
 
 #define TD 0
 #define TF 0
diff --git a/tests/ksysent.c b/tests/ksysent.c
index 9b7bf49b..8cac93ca 100644
--- a/tests/ksysent.c
+++ b/tests/ksysent.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Validate syscallent.h file.
+ *
+ * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,8 +27,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "defs.h"
-#include "syscall.h"
+#include "tests.h"
+#include "sysent.h"
+#include <stdio.h>
+#include <string.h>
+#include <asm/unistd.h>
 
 #define TD 0
 #define TF 0
diff --git a/tests/nsyscalls.c b/tests/nsyscalls.c
index 9a4d72af..aecf7aa7 100644
--- a/tests/nsyscalls.c
+++ b/tests/nsyscalls.c
@@ -27,8 +27,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "defs.h"
-#include "syscall.h"
+#include "tests.h"
+#include "sysent.h"
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <asm/unistd.h>
 
 #define TD 0
 #define TF 0
@@ -48,8 +52,6 @@ static const struct_sysent syscallent[] = {
 #include "syscallent.h"
 };
 
-#include <asm/unistd.h>
-
 #if defined __X32_SYSCALL_BIT && defined __NR_read \
  && (__X32_SYSCALL_BIT & __NR_read) != 0
 # define SYSCALL_BIT __X32_SYSCALL_BIT