Include header file being tested immediately after config.h.

13 files changed, 42 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 8c4fe25ee4..e9c5ba7fb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-24  Bruno Haible  <bruno@clisp.org>
+
+	* tests/test-argv-iter.c: Include header file being tested immediately
+	after config.h.
+	* tests/test-base64.c: Likewise.
+	* tests/test-flock.c: Likewise.
+	* tests/test-fsync.c: Likewise.
+	* tests/test-getdate.c: Likewise.
+	* tests/test-getndelim2.c: Likewise.
+	* tests/test-isfinite.c: Likewise.
+	* tests/test-isinf.c: Likewise.
+	* tests/test-strerror.c: Likewise.
+	* tests/test-strsignal.c: Likewise.
+
 2009-12-23  Eric Blake  <ebb9@byu.net>
 
 	unistd: work around cygwin bug
diff --git a/tests/test-argv-iter.c b/tests/test-argv-iter.c
index eef30148e3..fffa425c7f 100644
--- a/tests/test-argv-iter.c
+++ b/tests/test-argv-iter.c
@@ -17,6 +17,9 @@
 /* Written by Jim Meyering.  */
 
 #include <config.h>
+
+#include "argv-iter.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -35,8 +38,6 @@
     }                                                                        \
   while (0)
 
-#include "argv-iter.h"
-
 static FILE *
 write_nul_delimited_argv (char **argv)
 {
diff --git a/tests/test-base64.c b/tests/test-base64.c
index c2067284e2..2a2a4f522f 100644
--- a/tests/test-base64.c
+++ b/tests/test-base64.c
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include "base64.h"
+
 #include <stddef.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -24,8 +26,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "base64.h"
-
 #define ASSERT(expr)                                                    \
   do                                                                    \
     {                                                                   \
diff --git a/tests/test-flock.c b/tests/test-flock.c
index e0147e8de2..babf6efea3 100644
--- a/tests/test-flock.c
+++ b/tests/test-flock.c
@@ -1,5 +1,5 @@
 /* Test of flock() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 
 #include <config.h>
 
+#include <sys/file.h>
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include <sys/file.h>
-
 #define ASSERT(expr) \
   do                                                                    \
     {                                                                   \
diff --git a/tests/test-fsync.c b/tests/test-fsync.c
index c00d54fb35..4766eb06ac 100644
--- a/tests/test-fsync.c
+++ b/tests/test-fsync.c
@@ -16,10 +16,11 @@
 
 #include <config.h>
 
+#include <unistd.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #define ASSERT(expr) \
   do                                                                         \
diff --git a/tests/test-getdate.c b/tests/test-getdate.c
index 2971f97e48..b30ef82c48 100644
--- a/tests/test-getdate.c
+++ b/tests/test-getdate.c
@@ -19,14 +19,14 @@
 
 #include <config.h>
 
+#include "getdate.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "progname.h"
 
-#include "getdate.h"
-
 #define ASSERT(expr)                                                    \
   do                                                                    \
     {                                                                   \
diff --git a/tests/test-getndelim2.c b/tests/test-getndelim2.c
index 3ced1df50a..ff641bd518 100644
--- a/tests/test-getndelim2.c
+++ b/tests/test-getndelim2.c
@@ -19,12 +19,12 @@
 
 #include <config.h>
 
+#include "getndelim2.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "getndelim2.h"
-
 #define ASSERT(expr) \
   do                                                                         \
     {                                                                        \
diff --git a/tests/test-isfinite.c b/tests/test-isfinite.c
index 03f5cac0c5..2d718e2ccc 100644
--- a/tests/test-isfinite.c
+++ b/tests/test-isfinite.c
@@ -1,5 +1,5 @@
 /* Test of isfinite() substitute.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@
 
 #include <config.h>
 
-#include <float.h>
-#include <limits.h>
 #include <math.h>
 
+#include <float.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/test-isinf.c b/tests/test-isinf.c
index dffd99088b..c1a83d30e5 100644
--- a/tests/test-isinf.c
+++ b/tests/test-isinf.c
@@ -1,5 +1,5 @@
 /* Test of isinf() substitute.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@
 
 #include <config.h>
 
-#include <float.h>
-#include <limits.h>
 #include <math.h>
 
+#include <float.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/test-priv-set.c b/tests/test-priv-set.c
index 6d3b87ba06..8b50a7e143 100644
--- a/tests/test-priv-set.c
+++ b/tests/test-priv-set.c
@@ -17,6 +17,7 @@
 /* Written by David Bartley <dtbartle@csclub.uwaterloo.ca>, 2007.  */
 
 #include <config.h>
+
 #include "priv-set.h"
 
 #if HAVE_GETPPRIV
diff --git a/tests/test-random_r.c b/tests/test-random_r.c
index 7488543329..88deda0364 100644
--- a/tests/test-random_r.c
+++ b/tests/test-random_r.c
@@ -1,5 +1,5 @@
 /* Test random_r.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,7 +15,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+
 #include <stdlib.h>
+
 #include <stdio.h>
 #include <time.h>
 
diff --git a/tests/test-strerror.c b/tests/test-strerror.c
index ba23edc917..22e9f5ad95 100644
--- a/tests/test-strerror.c
+++ b/tests/test-strerror.c
@@ -19,10 +19,11 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define ASSERT(expr) \
   do                                                                         \
diff --git a/tests/test-strsignal.c b/tests/test-strsignal.c
index 3b362dd19f..6f06d8eca2 100644
--- a/tests/test-strsignal.c
+++ b/tests/test-strsignal.c
@@ -19,10 +19,11 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define ASSERT(expr) \
   do                                                                         \