10 files changed, 106 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 827af58..dbe17dd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,6 +54,7 @@ TESTSUITE_AT = \
  cloexec01.at\
  cloexec02.at\
  cloexec03.at\
+ closerr.at\
  dbmcreate00.at\
  dbmdel00.at\
  dbmdel01.at\
@@ -108,6 +109,7 @@ if COMPAT_OPT
 endif 
 
 check_PROGRAMS = \
+ closerr\
  fdop\
  g_open_ce\
  g_reorg_ce\
diff --git a/tests/closerr.at b/tests/closerr.at
new file mode 100644
index 0000000..5f5e208
--- /dev/null
+++ b/tests/closerr.at
@@ -0,0 +1,5 @@
+# This file is part of GDBM testsuite.                      -*- autoconf -*-
+AT_SETUP([gdbm_close error])
+AT_KEYWORDS([close])
+AT_CHECK(closerr,1,[],[ignore])
+AT_CLEANUP
diff --git a/tests/closerr.c b/tests/closerr.c
new file mode 100644
index 0000000..5bc8fdc
--- /dev/null
+++ b/tests/closerr.c
@@ -0,0 +1,56 @@
+/* This file is part of GDBM test suite.
+   Copyright (C) 2018 Free Software Foundation, Inc.
+
+   GDBM is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GDBM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GDBM. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "autoconf.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+#include "gdbm.h"
+
+int
+main (int argc, char **argv)
+{
+  GDBM_FILE dbf;
+  char dbname[] = "junk.gdbm";
+  int rc;
+  
+  assert (argc == 1);
+  
+  dbf = gdbm_open (dbname, 0, GDBM_NEWDB, 0600, NULL);
+  if (!dbf)
+    {
+      fprintf (stderr, "gdbm_open: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      return 1;
+    }
+  if (close (gdbm_fdesc (dbf)))
+    {
+      perror ("close");
+      return 77;
+    }
+
+  if (gdbm_close (dbf))
+    {
+      fprintf (stderr, "gdbm_close: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      return 1;
+    }
+      
+  return 0;
+}
diff --git a/tests/gtdel.c b/tests/gtdel.c
index 729086c..d0c711d 100644
--- a/tests/gtdel.c
+++ b/tests/gtdel.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include "gdbm.h"
 #include "progname.h"
 
@@ -93,6 +94,11 @@ main (int argc, char **argv)
 	  rc = 2;
 	}
     }
-  gdbm_close (dbf);
+  if (gdbm_close (dbf))
+    {
+      fprintf (stderr, "gdbm_close: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      rc = 3;
+    }
   exit (rc);
 }
diff --git a/tests/gtdump.c b/tests/gtdump.c
index dcc27ac..fb27997 100644
--- a/tests/gtdump.c
+++ b/tests/gtdump.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include "gdbm.h"
 #include "progname.h"
 
@@ -115,6 +116,11 @@ main (int argc, char **argv)
       exit (1);
     }
   
-  gdbm_close (dbf);
+  if (gdbm_close (dbf))
+    {
+      fprintf (stderr, "gdbm_close: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      exit (3);
+    }
   exit (0);
 }
diff --git a/tests/gtfetch.c b/tests/gtfetch.c
index c1ea45e..5070fcc 100644
--- a/tests/gtfetch.c
+++ b/tests/gtfetch.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include "gdbm.h"
 #include "progname.h"
 
@@ -130,6 +131,11 @@ main (int argc, char **argv)
       fputc ('\n', stdout);
     }
 
-  gdbm_close (dbf);
+  if (gdbm_close (dbf))
+    {
+      fprintf (stderr, "gdbm_close: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      rc = 3;
+    }
   exit (rc);
 }
diff --git a/tests/gtload.c b/tests/gtload.c
index 21c89b2..1493236 100644
--- a/tests/gtload.c
+++ b/tests/gtload.c
@@ -287,6 +287,11 @@ main (int argc, char **argv)
 	    }
 	}
     }
-  gdbm_close (dbf);
+  if (gdbm_close (dbf))
+    {
+      fprintf (stderr, "gdbm_close: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      exit (3);
+    }
   exit (0);
 }
diff --git a/tests/gtopt.c b/tests/gtopt.c
index b461d56..236ae92 100644
--- a/tests/gtopt.c
+++ b/tests/gtopt.c
@@ -406,7 +406,13 @@ main (int argc, char **argv)
 	}
     }
   
-  gdbm_close (dbf);
+  if (gdbm_close (dbf))
+    {
+      fprintf (stderr, "gdbm_close: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      exit (3);
+    }
+  
   exit (0);
 }
   
diff --git a/tests/gtrecover.c b/tests/gtrecover.c
index 0527c53..f5e6f97 100644
--- a/tests/gtrecover.c
+++ b/tests/gtrecover.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <errno.h>
 #include "gdbm.h"
 #include "progname.h"
 #include <assert.h>
@@ -119,6 +120,11 @@ main (int argc, char **argv)
 
   rc = gdbm_recover (dbf, &rcvr, rcvr_flags);
 
-  gdbm_close (dbf);
+  if (gdbm_close (dbf))
+    {
+      fprintf (stderr, "gdbm_close: %s; %s\n", gdbm_strerror (gdbm_errno),
+	       strerror (errno));
+      rc = 3;
+    }
   exit (rc);
 }
diff --git a/tests/testsuite.at b/tests/testsuite.at
index b7b1e4e..efc2705 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -43,6 +43,8 @@ m4_include([delete00.at])
 m4_include([delete01.at])
 m4_include([delete02.at])
 
+m4_include([closerr.at])
+
 AT_BANNER([Block size selection])
 m4_include([blocksize00.at])
 m4_include([blocksize01.at])