From ca5f314fc015cf0fff8fb3865fa0e6ae8d0dae57 Mon Sep 17 00:00:00 2001
From: Ed Hartnett <edwardjameshartnett@gmail.com>
Date: Fri, 16 Feb 2018 09:00:15 -0700
Subject: [PATCH] minor test cleanup

---
 nc_test4/tst_h4_lendian.c             |  1 -
 nc_test4/tst_h5_endians.c             |  4 +---
 nc_test4/tst_nc_test_file.c           | 33 ---------------------------
 nc_test4/tst_put_vars_two_unlim_dim.c |  1 +
 nc_test4/tst_rehash.c                 |  3 ++-
 5 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 nc_test4/tst_nc_test_file.c

diff --git a/nc_test4/tst_h4_lendian.c b/nc_test4/tst_h4_lendian.c
index e610e6bc7..e248aa394 100644
--- a/nc_test4/tst_h4_lendian.c
+++ b/nc_test4/tst_h4_lendian.c
@@ -4,7 +4,6 @@
  * https://github.com/Unidata/netcdf-c/issues/113.
  */
 
-#include <stdio.h>
 #include <config.h>
 #include <unistd.h>
 #include <nc_tests.h>
diff --git a/nc_test4/tst_h5_endians.c b/nc_test4/tst_h5_endians.c
index 3d9d839fe..081f8782a 100644
--- a/nc_test4/tst_h5_endians.c
+++ b/nc_test4/tst_h5_endians.c
@@ -7,10 +7,8 @@
  * Test contributed by Jeff Whitaker
  */
 
-#include <string.h>
-#include <netcdf.h>
-#include <stdio.h>
 #include <nc_tests.h>
+#include <string.h>
 #include "nc_logging.h"
 
 #define FILE_NAME_NC "tst_h5_endians.nc"
diff --git a/nc_test4/tst_nc_test_file.c b/nc_test4/tst_nc_test_file.c
deleted file mode 100644
index 70d3f4aea..000000000
--- a/nc_test4/tst_nc_test_file.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This is a quickie tester for netcdf-4. 
-   $Id: tst_nc_test_file.c,v 1.7 2005/12/29 19:16:19 ed Exp $
-*/
-
-#include <tests.h>
-
-#define FILE_NAME "../nc_test/nc_test_netcdf4.nc"
-
-int
-main()
-{
-   int ncid;
-   int retval; 
-   size_t start[1] = {0}, count[1] = {2};
-   ptrdiff_t stride[1] = {2};
-   short short_data[256];
-   float float_data[256];
-
-   printf("\n*** Testing with file %s\n", FILE_NAME);
-
-   /*nc_set_log_level(4);*/
-
-   printf("*** Testing whether we can open and read from it...");
-   if ((retval = nc_open(FILE_NAME, 0, &ncid))) ERR;
-   if ((retval = nc_get_vars_short(ncid, 35, start, count, stride, 
-				   short_data)) != NC_ERANGE) ERR;
-   if ((retval = nc_get_vars(ncid, 35, start, count, stride, short_data))) ERR;
-   if ((retval = nc_close(ncid))) ERR;
-
-   SUMMARIZE_ERR;
-
-   FINAL_RESULTS;
-}
diff --git a/nc_test4/tst_put_vars_two_unlim_dim.c b/nc_test4/tst_put_vars_two_unlim_dim.c
index 98a9b13e4..785d0d56b 100644
--- a/nc_test4/tst_put_vars_two_unlim_dim.c
+++ b/nc_test4/tst_put_vars_two_unlim_dim.c
@@ -3,6 +3,7 @@
  * https://github.com/Unidata/netcdf-c/issues/160
  */
 
+#include <config.h>
 #include "netcdf.h"
 
 #include <stdio.h>
diff --git a/nc_test4/tst_rehash.c b/nc_test4/tst_rehash.c
index 460dee97c..c594bd1cc 100644
--- a/nc_test4/tst_rehash.c
+++ b/nc_test4/tst_rehash.c
@@ -8,10 +8,11 @@
    Tests to see if the hashmap is being properly updated.
 
    */
+#include <config.h>
+#include <netcdf.h>
 
 #define FILENAME "tst_rehash.nc"
 
-#include <netcdf.h>
 int main()
 {
   int  status;