[svn-r19423] Bug fix: 1961-- AIX 6.1 --enable-share did not work.

Description:
In an AIX 6.1 system, configure --enable-shared could not build a shared
HDF5 library. The problem was because the version of config.guess was too
old to recongnize AIX 6.X and also configure.in had a local fix which did
not recognize AIX 6.X.

Solution:
1. Mike McGreevy updated bin/config.guess to handle AIX 6.X.
2 Albert fixed configure.in to recognize AIX 6.X.

Note that though HDF5 can build shared lib for AIX 6.X systems
but it still could not install the proper library as in AIX 5.X
systems. Also, bin/config.sub should be updated too.


Tested: BP which is the AIX 6.1 system that exposed this problem.

4 files changed, 306 insertions, 136 deletions

diff --git a/bin/config.guess b/bin/config.guess
index e3ef63f..f32079a 100755
--- a/bin/config.guess
+++ b/bin/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-12-13'
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -55,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -106,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -206,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -325,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -527,7 +532,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -764,12 +769,19 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -779,9 +791,18 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -815,6 +836,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
@@ -851,7 +882,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,7 +905,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -925,6 +964,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -967,7 +1009,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -977,7 +1019,11 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1179,6 +1225,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1429,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config/ibm-aix6.x b/config/ibm-aix6.x
new file mode 100644
index 0000000..24c2e11
--- /dev/null
+++ b/config/ibm-aix6.x
@@ -0,0 +1,21 @@
+#							-*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+# Configuration file for building on the IBM AIX 6.X platforms.
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modesrcdir/config/ibm-aix
+
+# Use the generic ibm-aix.
+. $srcdir/config/ibm-aix
diff --git a/configure.in b/configure.in
index a72fc15..80b0a31 100644
--- a/configure.in
+++ b/configure.in
@@ -254,6 +254,9 @@ case $host_os in
   aix5.*)
     host_os_novers=aix5.x
     ;;
+  aix6.*)
+    host_os_novers=aix6.x
+    ;;
   freebsd*)
     host_os_novers=freebsd
     ;;
diff --git a/test/big.c b/test/big.c
index 8d65559..e4381c5 100644
--- a/test/big.c
+++ b/test/big.c
@@ -16,15 +16,57 @@
 /*
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Wednesday, April  8, 1998
+ * Modified:	Albert Cheng <acheng@hdfgroup.org>
+ * 		September 11, 2010
+ */
+/*
+ * The purpose of this test is to verify if a virtual file driver can handle:
+ *    a. Large file (2GB)
+ * 	 This should exceed 32bits I/O system since offset is a signed
+ * 	 integral type (in order to support negative offset with respect to
+ * 	 end of file).
+ *    b. Extra Large file (4GB)
+ * 	 This definite exceeds 32bit I/O and file systems.
+ *    c. Huge file (tens of GB)
+ * 	 This verifies the HDF5 library handles big logical file size
+ * 	 correctly.
+ * In practice, if a VFD can handle a big file size, there is no need to
+ * test the smaller file sizes.  E.g., If it can handle the Huge file,
+ * there is no need to test the Extra large or Large files. Therefore the
+ * test starts with larger size files and continues to test the smaller size
+ * files only if the large sige file tests have failed.
+ *
+ * Another consideration is that even if a VFD is capable to handle a
+ * huge file but it is likely to take a long time to write every byte
+ * of a huge file. E.g., a simple workstation may have disks of write
+ * speed of 10MB/sec. A huge file of 30GB will take about an hour to
+ * write it. Therefore, this test will run the huge file test only if the
+ * underlying file system supports sparse file. (A Sparse file here means
+ * that disk space is allocated only when the contents are actually written.
+ * E.g., If one creates a new file, seeks forward 10 million bytes, writes
+ * 1 bytes and closes the file, then a sparse file, will show file size of
+ * 10 million bytes but actaully uses only couple disk blocks, much smaller
+ * than the formal file size.)
+ *
+ * One more consideration is that we want to distinguish an HDF5 library
+ * failure from some system limits such as current free disk space or user
+ * disk space quota. Therefore, the test will first attempt to verify no
+ * such limits exist before running the actual VFD tests.
  */
 #include "h5test.h"
 
+typedef enum fsizes_t { LFILE, XLFILE, HUGEFILE} fsizes_t;
+typedef enum vfd_t { SEC2_VFD, STDIO_VFD, FAMILY_VFD } vfd_t;
+fsizes_t file_size= HUGEFILE;
+
 const char *FILENAME[] = {
     "big",
     "sec2",
     "stdio",
     NULL
 };
+int	cflag=1;		/* check file system before test */
+hsize_t	family_size_def;	/* default family file size */
 
 #define DNAME		"big.data"
 
@@ -44,6 +86,7 @@ const char *FILENAME[] = {
 
 /* Protocols */
 static void usage(void);
+int testvfd(vfd_t vfd);
 
 /* Array used to record all addresses at which data has been written */
 /* so far.  Used to prevent overlapping writes. */
@@ -157,22 +200,32 @@ is_sparse(void)
  *-------------------------------------------------------------------------
  */
 static int
-supports_big(void)
+supports_big(vfd_t vfd)
 {
     int		fd;
 
-    if ((fd=HDopen("y.h5", O_RDWR|O_TRUNC|O_CREAT, 0666)) < 0) return 0;
-
-    /* Write a few bytes at 2GB */
-    if (HDlseek(fd, 2*GB, SEEK_SET)!=2*GB) return 0;
-    if (5!=HDwrite(fd, "hello", (size_t)5)) return 0;
-
-    /* Write a few bytes at 4GB */
-    if (HDlseek(fd, 4*GB, SEEK_SET) != 4*GB) return 0;
-    if (5!=HDwrite(fd, "hello", (size_t)5)) return 0;
-
-    if (HDclose(fd) < 0) return 0;
-    if (HDremove("y.h5") < 0) return 0;
+    switch (vfd){
+    case FAMILY_VFD:
+    case SEC2_VFD:
+    case STDIO_VFD:
+	if ((fd=HDopen("y.h5", O_RDWR|O_TRUNC|O_CREAT, 0666)) < 0) return 0;
+
+	/* Write a few bytes at 2GB */
+	if (HDlseek(fd, 2*GB, SEEK_SET)!=2*GB) return 0;
+	if (5!=HDwrite(fd, "hello", (size_t)5)) return 0;
+
+	/* Write a few bytes at 4GB */
+	if (HDlseek(fd, 4*GB, SEEK_SET) != 4*GB) return 0;
+	if (5!=HDwrite(fd, "hello", (size_t)5)) return 0;
+
+	if (HDclose(fd) < 0) return 0;
+	if (HDremove("y.h5") < 0) return 0;
+	break;
+    default:
+	/* unknown or unsupported VFD */
+	return 0;
+	break;
+    }
 
     return (1);
 }
@@ -475,6 +528,142 @@ usage(void)
 
 
 
+int testvfd(vfd_t vfd)
+{
+    hid_t	fapl=-1;
+    hsize_t	family_size;
+    char	filename[1024];
+
+
+    switch(vfd){
+    case FAMILY_VFD:
+	/* Why should I do h5_fileaccess to get fapl and prompty override it??*/
+	fapl = h5_fileaccess();
+
+	/* Test big file with the family driver */
+	puts("Testing big file with the Family Driver ");
+	if (H5FD_FAMILY!=H5Pget_driver(fapl)) {
+	    HDfprintf(stdout,
+	       "Changing file drivers to the family driver, %Hu bytes each\n",
+	       family_size_def);
+	    if (H5Pset_fapl_family(fapl, family_size_def, H5P_DEFAULT) < 0) goto error;
+	} else if (H5Pget_fapl_family(fapl, &family_size, NULL) < 0) {
+	    goto error;
+	} else if (family_size!=family_size_def) {
+	    HDfprintf(stdout, "Changing family member size from %Hu to %Hu\n",
+		   family_size, family_size_def);
+	    if (H5Pset_fapl_family(fapl, family_size_def, H5P_DEFAULT) < 0)
+		goto error;
+	}
+
+	if (cflag){
+	    /*
+	     * We shouldn't run this test if the file system doesn't support holes
+	     * because we would generate multi-gigabyte files.
+	     */
+	    puts("Checking if file system is adequate for this test...");
+	    if (sizeof(long long)<8 || 0==GB8LL) {
+		puts("Test skipped because sizeof(long long) is too small. This");
+		puts("hardware apparently doesn't support 64-bit integer types.");
+		usage();
+		goto quit;
+	    }
+	    if (!is_sparse()) {
+		puts("Test skipped because file system does not support holes.");
+		usage();
+		goto quit;
+	    }
+	    if (!enough_room(fapl)) {
+		puts("Test skipped because of quota (file size or num open files).");
+		usage();
+		goto quit;
+	    }
+	}
+
+	/* Do the test with the Family Driver */
+	h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
+
+	if (writer(filename, fapl, WRT_N)) goto error;
+	if (reader(filename, fapl)) goto error;
+
+	puts("Test passed with the Family Driver.");
+    break;
+
+    case SEC2_VFD:
+	/*
+	 * We shouldn't run this test if the file system doesn't support big files
+	 * because we would generate multi-gigabyte files.
+	 */
+	puts("\nChecking if file system supports big files...");
+	if (!supports_big(SEC2_VFD)) {
+	    puts("Test for sec2 is skipped because file system does not support big files.");
+	    usage();
+	    goto quit;
+	}
+
+	/* Test big file with the SEC2 driver */
+	puts("Testing big file with the SEC2 Driver ");
+
+	fapl = h5_fileaccess();
+	if(H5Pset_fapl_sec2(fapl) < 0)
+
+	HDmemset(filename, 0, sizeof(filename));
+	h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
+
+	if (writer(filename, fapl, WRT_N)) goto error;
+	if (reader(filename, fapl)) goto error;
+
+	puts("Test passed with the SEC2 Driver.");
+    break;
+
+    case STDIO_VFD:
+	/*
+	 * We shouldn't run this test if the file system doesn't support big files
+	 * because we would generate multi-gigabyte files.
+	 */
+	puts("\nChecking if file system supports big files...");
+	if (!supports_big(STDIO_VFD)) {
+	    puts("Test for stdio is skipped because file system does not support big files.");
+	    usage();
+	    goto quit;
+	}
+	/* Test big file with the STDIO driver only if fseeko is supported,
+	 * because the OFFSET parameter of fseek has the type LONG, not big
+	 * enough to support big files. */
+	puts("\nTesting big file with the STDIO Driver ");
+
+	fapl = h5_fileaccess();
+	if(H5Pset_fapl_stdio(fapl) < 0)
+
+	HDmemset(filename, 0, sizeof(filename));
+	h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
+
+	if (writer(filename, fapl, WRT_N)) goto error;
+	if (reader(filename, fapl)) goto error;
+	puts("Test passed with the STDIO Driver.");
+    break;
+
+    default:
+	puts("Unsupprted VFD");
+	usage();
+	goto error;;
+    } /* end of switch (vfd) */
+
+quit:
+    /* End with normal return code */
+    /* Clean up the test file */
+    if (h5_cleanup(FILENAME, fapl)) remove(DNAME);
+    return 0;
+
+
+error:
+    if (fapl>=0) H5Pclose(fapl);
+    puts("*** TEST FAILED ***");
+    return 1;
+}
+
+
+
 /*-------------------------------------------------------------------------
  * Function:	main
  *
@@ -501,12 +690,7 @@ usage(void)
 int
 main (int ac, char **av)
 {
-    hid_t	fapl=-1;
-    hsize_t	family_size;
-    hsize_t	family_size_def;	/* default family file size */
     unsigned long seed = 0;             /* Random # seed */
-    int		cflag=1;		/* check file system before test */
-    char	filename[1024];
 
     /* parameters setup */
     family_size_def = FAMILY_SIZE;
@@ -546,113 +730,20 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
 #endif /* QAK */
     HDsrandom(seed);
 
-    /* Reset library */
-    h5_reset();
-    fapl = h5_fileaccess();
-
-    /* Test big file with the family driver */
-    puts("Testing big file with the Family Driver ");
-    if (H5FD_FAMILY!=H5Pget_driver(fapl)) {
-	HDfprintf(stdout,
-	   "Changing file drivers to the family driver, %Hu bytes each\n",
-	   family_size_def);
-	if (H5Pset_fapl_family(fapl, family_size_def, H5P_DEFAULT) < 0) goto error;
-    } else if (H5Pget_fapl_family(fapl, &family_size, NULL) < 0) {
+/*=================================================*/
+    if (testvfd(FAMILY_VFD) != 0)
+	goto error;
+    if (testvfd(SEC2_VFD) != 0)
+	goto error;
+    if (testvfd(STDIO_VFD) != 0)
 	goto error;
-    } else if (family_size!=family_size_def) {
-	HDfprintf(stdout, "Changing family member size from %Hu to %Hu\n",
-	       family_size, family_size_def);
-	if (H5Pset_fapl_family(fapl, family_size_def, H5P_DEFAULT) < 0)
-	    goto error;
-    }
-
-    if (cflag){
-	/*
-	 * We shouldn't run this test if the file system doesn't support holes
-	 * because we would generate multi-gigabyte files.
-	 */
-	puts("Checking if file system is adequate for this test...");
-	if (sizeof(long long)<8 || 0==GB8LL) {
-	    puts("Test skipped because sizeof(long long) is too small. This");
-	    puts("hardware apparently doesn't support 64-bit integer types.");
-	    usage();
-	    goto quit;
-	}
-	if (!is_sparse()) {
-	    puts("Test skipped because file system does not support holes.");
-	    usage();
-	    goto quit;
-	}
-	if (!enough_room(fapl)) {
-	    puts("Test skipped because of quota (file size or num open files).");
-	    usage();
-	    goto quit;
-	}
-    }
-
-    /* Do the test with the Family Driver */
-    h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-
-    if (writer(filename, fapl, WRT_N)) goto error;
-    if (reader(filename, fapl)) goto error;
-
-    puts("Test passed with the Family Driver.");
-
-    /*
-     * We shouldn't run this test if the file system doesn't support big files
-     * because we would generate multi-gigabyte files.
-     */
-    puts("\nChecking if file system supports big files...");
-    if (!supports_big()) {
-        puts("Tests for sec2 and stdio are skipped because file system does not support big files.");
-        usage();
-        goto quit;
-    }
-
-    /* Clean up the test file */
-    if (h5_cleanup(FILENAME, fapl)) remove(DNAME);
-
-    /* Test big file with the SEC2 driver */
-    puts("Testing big file with the SEC2 Driver ");
-
-    fapl = h5_fileaccess();
-    if(H5Pset_fapl_sec2(fapl) < 0)
-
-    HDmemset(filename, 0, sizeof(filename));
-    h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
-
-    if (writer(filename, fapl, WRT_N)) goto error;
-    if (reader(filename, fapl)) goto error;
-
-    puts("Test passed with the SEC2 Driver.");
-
-#ifdef H5_HAVE_FSEEKO
-    /* Clean up the test file */
-    if (h5_cleanup(FILENAME, fapl)) remove(DNAME);
-
-    /* Test big file with the STDIO driver only if fseeko is supported,
-     * because the OFFSET parameter of fseek has the type LONG, not big
-     * enough to support big files. */
-    puts("\nTesting big file with the STDIO Driver ");
-
-    fapl = h5_fileaccess();
-    if(H5Pset_fapl_stdio(fapl) < 0)
 
-    HDmemset(filename, 0, sizeof(filename));
-    h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
-
-    if (writer(filename, fapl, WRT_N)) goto error;
-    if (reader(filename, fapl)) goto error;
-    puts("Test passed with the STDIO Driver.");
-#endif
 
 quit:
     /* End with normal exit code */
-    if (h5_cleanup(FILENAME, fapl)) remove(DNAME);
     return 0;
 
 error:
-    if (fapl>=0) H5Pclose(fapl);
     puts("*** TEST FAILED ***");
     return 1;
 }