[svn-r27607] merge from trunk.

21 files changed, 127 insertions, 229 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c94b880..f33c2df 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -58,6 +58,12 @@ if (BUILD_SHARED_LIBS)
       INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
       INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
   )
+  if (HDF5_ENABLE_THREADSAFE)
+    set_property (TARGET ${HDF5_TEST_LIBSH_TARGET}
+        APPEND PROPERTY COMPILE_DEFINITIONS
+            "H5_HAVE_THREADSAFE"
+    )
+  endif (HDF5_ENABLE_THREADSAFE)
 endif (BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
@@ -103,7 +109,7 @@ endif (BUILD_SHARED_LIBS)
         TARGET     ${HDF5_TEST_PLUGIN_LIB_TARGET}
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different 
+        ARGS       -E copy_if_different
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir1/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
@@ -134,7 +140,7 @@ endif (BUILD_SHARED_LIBS)
         TARGET     ${HDF5_TEST_PLUGIN_LIB_TARGET}
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different 
+        ARGS       -E copy_if_different
           "$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/testdir2/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
     )
@@ -207,7 +213,7 @@ set (H5_TESTS
     #cache_api
     #cache_tagging
     pool
-    hyperslab
+    #hyperslab
     istore
     bittests
     dt_arith
@@ -307,6 +313,26 @@ if (BUILD_SHARED_LIBS)
   set_target_properties (cache_tagging-shared PROPERTIES FOLDER test)
 endif (BUILD_SHARED_LIBS)
 
+#-- Adding test for hyperslab
+add_executable (hyperslab ${HDF5_TEST_SOURCE_DIR}/hyperslab.c)
+TARGET_NAMING (hyperslab STATIC)
+TARGET_C_PROPERTIES (hyperslab STATIC " " " ")
+target_link_libraries (hyperslab ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+set_target_properties (hyperslab PROPERTIES FOLDER test)
+if (BUILD_SHARED_LIBS)
+  add_executable (hyperslab-shared ${HDF5_TEST_SOURCE_DIR}/hyperslab.c)
+  TARGET_NAMING (hyperslab-shared SHARED)
+  TARGET_C_PROPERTIES (hyperslab-shared SHARED " " " ")
+  target_link_libraries (hyperslab-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (hyperslab-shared PROPERTIES FOLDER test)
+  if (HDF5_ENABLE_THREADSAFE)
+    set_property (TARGET hyperslab-shared
+        APPEND PROPERTY COMPILE_DEFINITIONS
+            "H5_HAVE_THREADSAFE"
+    )
+  endif (HDF5_ENABLE_THREADSAFE)
+endif (BUILD_SHARED_LIBS)
+
 #-- Adding test for ttsafe
 add_executable (ttsafe
     ${HDF5_TEST_SOURCE_DIR}/ttsafe.c
@@ -331,6 +357,12 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (ttsafe-shared SHARED " " " ")
   target_link_libraries (ttsafe-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (ttsafe-shared PROPERTIES FOLDER test)
+  if (HDF5_ENABLE_THREADSAFE)
+    set_property (TARGET ttsafe-shared
+        APPEND PROPERTY COMPILE_DEFINITIONS
+            "H5_HAVE_THREADSAFE"
+    )
+  endif (HDF5_ENABLE_THREADSAFE)
 endif (BUILD_SHARED_LIBS)
 
 #-- Adding test for err_compat
@@ -379,7 +411,7 @@ endif (BUILD_SHARED_LIBS)
 
 #-- Adding test for libinfo
 set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake)
-file (WRITE ${GREP_RUNNER} 
+file (WRITE ${GREP_RUNNER}
   "file (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\")
 if (\${TEST_RESULT} STREQUAL \"0\")
   message (FATAL_ERROR \"Failed: The output: \${TEST_RESULT} of \${TEST_PROGRAM} did not contain SUMMARY OF THE HDF5 CONFIGURATION\")
diff --git a/test/H5srcdir.h b/test/H5srcdir.h
index 4f0f439..81624d8 100644
--- a/test/H5srcdir.h
+++ b/test/H5srcdir.h
@@ -32,11 +32,7 @@ static char srcdir_path[1024] = "";
 static char srcdir_testpath[1024] = "";
 
 /* Append the test file name to the srcdir path and return the whole string */
-#ifdef H5_VMS
-static const char *H5_get_srcdir_filename(char *filename)
-#else
 static const char *H5_get_srcdir_filename(const char *filename)
-#endif
 {
     const char *srcdir = HDgetenv("srcdir");
 
@@ -46,19 +42,7 @@ static const char *H5_get_srcdir_filename(const char *filename)
 
     /* Build path to test file */
     if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-#ifdef H5_VMS
-        HDstrcpy(srcdir_testpath, srcdir);
-        if(filename[0] == '[') {
-            char *tmp = filename;
-
-            srcdir_testpath[HDstrlen(srcdir) - 1] = '\0';
-            HDstrcat(srcdir_testpath, ++tmp);
-        } /* end if */
-        else
-            HDstrcat(srcdir_testpath, filename);
-#else
         HDsnprintf(srcdir_testpath, sizeof(srcdir_testpath), "%s/%s", srcdir, filename);
-#endif
         return(srcdir_testpath);
     } /* end if */
     else
diff --git a/test/dt_arith.c b/test/dt_arith.c
index b3f5cad..eb201d0 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -58,10 +58,9 @@ const char *FILENAME[] = {
 };
 
 /*
- * Count up or down depending on whether the machine is big endian, little
- * endian, or VAX (OpenVMS).  If local variable `endian' is H5T_ORDER_BE then
- * the result will be I, otherwise the result will be Z-(I+1).  VAX is printed
- * as little endian.
+ * Count up or down depending on whether the machine is big endian or little
+ * endian.  If local variable `endian' is H5T_ORDER_BE then the result will
+ * be I, otherwise the result will be Z-(I+1).
  */
 #define ENDIAN(Z,I,E)	(H5T_ORDER_BE==E?(I):(Z)-((I)+1))
 
@@ -88,11 +87,6 @@ static int skip_overflow_tests_g = 0;
 #define HANDLE_SIGFPE
 #endif
 
-/* OpenVMS doesn't have this feature.  Make sure to disable it*/
-#ifdef H5_VMS
-#undef HANDLE_SIGFPE
-#endif
-
 /*
  * Decide what values of floating-point number we want to test.  They are
  * 1 - normalized; 2 - denormalized; 3 - special.
@@ -2740,24 +2734,6 @@ my_isnan(dtype_t type, void *val)
 	    retval = 1;
     }
 
-#ifdef H5_VMS
-    /* For "float" and "double" on OpenVMS/Alpha, NaN is
-     * actually a valid value of maximal value.*/
-    if(!retval) {
-	if (FLT_FLOAT==type) {
-	    float x;
-	    HDmemcpy(&x, val, sizeof(float));
-            retval = (x==FLT_MAX || x==-FLT_MAX);
-	} else if (FLT_DOUBLE==type) {
- 	    double x;
-	    HDmemcpy(&x, val, sizeof(double));
-            retval = (x==DBL_MAX || x==-DBL_MAX);
-	} else {
-	    return 0;
-	}
-    }
-#endif /*H5_VMS*/
-
     return retval;
 }
 
@@ -2786,23 +2762,8 @@ my_isinf(int endian, unsigned char *val, size_t size,
 
     bits = (unsigned char*)HDcalloc((size_t)1, size);
 
-#ifdef H5_VMS
-    if(H5T_ORDER_VAX==endian) {
-        for (i = 0; i < size; i += 4) {
-            bits[i] = val[(size-2)-i];
-            bits[i+1] = val[(size-1)-i];
-
-            bits[(size-2)-i] = val[i];
-            bits[(size-1)-i] = val[i+1];
-        }
-    } else {
-        for (i=0; i<size; i++)
-            bits[size-(i+1)] = *(val + ENDIAN(size,i,endian));
-    }
-#else /*H5_VMS*/
     for (i=0; i<size; i++)
         bits[size-(i+1)] = *(val + ENDIAN(size, i, endian));
-#endif /*H5_VMS*/
 
     if(H5T__bit_find(bits, mpos, msize, H5T_BIT_LSB, 1) < 0 &&
             H5T__bit_find(bits, epos, esize, H5T_BIT_LSB, 0) < 0)
@@ -2860,9 +2821,6 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
     unsigned char	*hw=NULL;		/*ptr to hardware-conv'd*/
     int			underflow;		/*underflow occurred	*/
     int			overflow;		/*overflow occurred	*/
-#ifdef H5_VMS
-    int			maximal;		/*maximal value occurred, for VMS only.	*/
-#endif /* H5_VMS */
     int 		uflow=0;		/*underflow debug counters*/
     size_t		j, k;			/*counters		*/
     int			sendian;		/* source type endianess */
@@ -2913,9 +2871,7 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
      * The remainder of this function is executed only by the child if
      * HANDLE_SIGFPE is defined.
      */
-#ifndef H5_VMS
     HDsignal(SIGFPE,fpe_handler);
-#endif
 
     /* What are the names of the source and destination types */
     if (H5Tequal(src, H5T_NATIVE_FLOAT)) {
@@ -3013,47 +2969,19 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
     switch (run_test) {
         case TEST_NOOP:
         case TEST_NORMAL:
-#ifdef H5_VMS
             if(src_type == FLT_FLOAT) {
                 INIT_FP_NORM(float, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP,
                         src_size, dst_size, buf, saved, nelmts);
-            } else if(src_type == FLT_DOUBLE && dst_type == FLT_FLOAT) {
-                /*Temporary solution for VMS.  Cap double values between maximal and minimal
-                 *destination values because VMS return exception when overflows or underflows.
-                 *Same below.*/
-                INIT_FP_NORM(double, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP,
-                        src_size, dst_size, buf, saved, nelmts);
             } else if(src_type == FLT_DOUBLE) {
                 INIT_FP_NORM(double, DBL_MAX, DBL_MIN, DBL_MAX_10_EXP, DBL_MIN_10_EXP,
                         src_size, dst_size, buf, saved, nelmts);
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
-            } else if(src_type == FLT_LDOUBLE && dst_type == FLT_FLOAT) {
-                INIT_FP_NORM(long double, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP,
-                        src_size, dst_size, buf, saved, nelmts);
-            } else if(src_type == FLT_LDOUBLE && dst_type == FLT_DOUBLE) {
-                INIT_FP_NORM(long double, DBL_MAX, DBL_MIN, DBL_MAX_10_EXP, DBL_MIN_10_EXP,
-                        src_size, dst_size, buf, saved, nelmts);
             } else if(src_type == FLT_LDOUBLE) {
                 INIT_FP_NORM(long double, LDBL_MAX, LDBL_MIN, LDBL_MAX_10_EXP, LDBL_MIN_10_EXP,
                         src_size, dst_size, buf, saved, nelmts);
 #endif
             } else
                 goto error;
-#else /*H5_VMS*/
-            if(src_type == FLT_FLOAT) {
-                INIT_FP_NORM(float, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP,
-                        src_size, dst_size, buf, saved, nelmts);
-            } else if(src_type == FLT_DOUBLE) {
-                INIT_FP_NORM(double, DBL_MAX, DBL_MIN, DBL_MAX_10_EXP, DBL_MIN_10_EXP,
-                        src_size, dst_size, buf, saved, nelmts);
-#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
-            } else if(src_type == FLT_LDOUBLE) {
-                INIT_FP_NORM(long double, LDBL_MAX, LDBL_MIN, LDBL_MAX_10_EXP, LDBL_MIN_10_EXP,
-                        src_size, dst_size, buf, saved, nelmts);
-#endif
-            } else
-                goto error;
-#endif /*H5_VMS*/
 
             break;
         case TEST_DENORM:
@@ -3129,9 +3057,6 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
                 hw = (unsigned char*)&hw_f;
                 underflow = HDfabs(*((double*)aligned)) < FLT_MIN;
                 overflow = HDfabs(*((double*)aligned)) > FLT_MAX;
-#ifdef H5_VMS
-                maximal = HDfabs(*((double*)aligned)) == FLT_MAX;
-#endif
             } else if (FLT_DOUBLE==dst_type) {
                 hw_d = *((double*)aligned);
                 hw = (unsigned char*)&hw_d;
@@ -3149,17 +3074,11 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
                 hw = (unsigned char*)&hw_f;
                 underflow = HDfabsl(*((long double*)aligned)) < FLT_MIN;
                 overflow = HDfabsl(*((long double*)aligned)) > FLT_MAX;
-#ifdef H5_VMS
-                maximal = HDfabs(*((long double*)aligned)) == FLT_MAX;
-#endif
             } else if (FLT_DOUBLE==dst_type) {
                 hw_d = *((long double*)aligned);
                 hw = (unsigned char*)&hw_d;
                 underflow = HDfabsl(*((long double*)aligned)) < DBL_MIN;
                 overflow = HDfabsl(*((long double*)aligned)) > DBL_MAX;
-#ifdef H5_VMS
-                maximal = HDfabs(*((long double*)aligned)) == DBL_MAX;
-#endif
             } else {
                 hw_ld = *((long double*)aligned);
                 hw = (unsigned char*)&hw_ld;
@@ -3194,17 +3113,6 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
         if (k==dst_size)
             continue; /*no error*/
 
-#ifdef H5_VMS
-        /* For "float" and "double" on OpenVMS/Alpha, NaN is
-         * a valid value of maximal value.*/
-        if (FLT_FLOAT==src_type &&
-                my_isnan(src_type, saved+j*sizeof(float))) {
-            continue;
-        } else if (FLT_DOUBLE==src_type &&
-                my_isnan(src_type, saved+j*sizeof(double))) {
-            continue;
-        }
-#endif /*H5_VMS*/
 
         /*
          * Assume same if both results are NaN.  There are many NaN bit
@@ -3262,11 +3170,6 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
                 if (overflow && my_isinf(dendian, buf+j*sizeof(float),
                         dst_size, dst_mpos, dst_msize, dst_epos, dst_esize))
                     continue;	/* all overflowed, no error */
-#ifdef H5_VMS
-                if (maximal && my_isinf(dendian, buf+j*sizeof(float),
-                        dst_size, dst_mpos, dst_msize, dst_epos, dst_esize))
-                    continue;	/* maximal value, no error */
-#endif /*H5_VMS*/
                 check_mant[0] = HDfrexpf(x, check_expo+0);
                 check_mant[1] = HDfrexpf(hw_f, check_expo+1);
             } else if (FLT_DOUBLE==dst_type) {
@@ -3278,11 +3181,6 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst)
                 if (overflow && my_isinf(dendian, buf+j*sizeof(double),
                         dst_size, dst_mpos, dst_msize, dst_epos, dst_esize))
                     continue;	/* all overflowed, no error */
-#ifdef H5_VMS
-                if (maximal && my_isinf(dendian, buf+j*sizeof(double),
-                        dst_size, dst_mpos, dst_msize, dst_epos, dst_esize))
-                    continue;	/* maximal value, no error */
-#endif /*H5_VMS*/
                 check_mant[0] = HDfrexp(x, check_expo+0);
                 check_mant[1] = HDfrexp(hw_d, check_expo+1);
 #if H5_SIZEOF_LONG_DOUBLE !=0 && (H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE)
@@ -4924,7 +4822,6 @@ run_fp_tests(const char *name)
     nerrors += test_conv_flt_1(name, TEST_NORMAL, H5T_NATIVE_LDOUBLE, H5T_NATIVE_DOUBLE);
 #endif
 
-#ifndef H5_VMS
     /*Test denormalized values.  TEST_DENORM indicates denormalized values.*/
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_FLOAT, H5T_NATIVE_DOUBLE);
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_DOUBLE, H5T_NATIVE_FLOAT);
@@ -4944,7 +4841,6 @@ run_fp_tests(const char *name)
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_LDOUBLE, H5T_NATIVE_FLOAT);
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_LDOUBLE, H5T_NATIVE_DOUBLE);
 #endif
-#endif /*H5_VMS*/
 
 done:
     return nerrors;
@@ -5085,11 +4981,7 @@ run_fp_int_conv(const char *name)
     int		nerrors = 0;
     int         test_values;
 
-#ifdef H5_VMS
-    test_values = TEST_NORMAL;
-#else
     for(test_values = TEST_NORMAL; test_values <= TEST_SPECIAL; test_values++) {
-#endif /*H5_VMS*/
 
         nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_FLOAT, H5T_NATIVE_SCHAR);
         nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_DOUBLE, H5T_NATIVE_SCHAR);
@@ -5194,9 +5086,7 @@ run_fp_int_conv(const char *name)
 #endif /*H5_LDOUBLE_TO_LLONG_ACCURATE*/
 #endif
 #endif
-#ifndef H5_VMS
     } /* end for */
-#endif /* H5_VMS */
 
     return nerrors;
 }
@@ -5248,10 +5138,8 @@ main(void)
      * for user-defined integer types */
     nerrors += test_derived_integer();
 
-#ifndef H5_VMS
     /* Does floating point overflow generate a SIGFPE? */
     generates_sigfpe();
-#endif
 
     /* Test degenerate cases */
     nerrors += run_fp_tests("noop");
diff --git a/test/dtypes.c b/test/dtypes.c
index 59cf000..88bbce0 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -3233,11 +3233,7 @@ test_compound_18(void)
 
     /* Open Generated File */
     /* (generated with gen_bad_compound.c) */
-#ifdef H5_VMS
-    if((file = H5Fopen(TESTFILE, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-#else
     if((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-#endif
 
     /* Try to open the datatype */
     H5E_BEGIN_TRY {
diff --git a/test/fheap.c b/test/fheap.c
index fee6fdf..c300028 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -16418,9 +16418,7 @@ curr_test = FHEAP_TEST_NORMAL;
         nerrors += test_id_limits(fapl, &small_cparam);
         nerrors += test_filtered_create(fapl, &small_cparam);
         nerrors += test_size(fapl, &small_cparam);
-#ifndef H5_CANNOT_OPEN_TWICE
         nerrors += test_reopen_hdr(fapl, &small_cparam);
-#endif /*H5_CANNOT_OPEN_TWICE*/
 #else /* QAK */
 HDfprintf(stderr, "Uncomment tests!\n");
 #endif /* QAK */
diff --git a/test/flush2.c b/test/flush2.c
index 28ce41e..0ee299e 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -189,8 +189,6 @@ main(void)
 #if defined H5_HAVE_WIN32_API && !defined (hdf5_EXPORTS)
     SKIPPED();
     puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
-#elif defined H5_VMS
-    SKIPPED();
 #else
     H5_FAILED()
     goto error;
@@ -212,8 +210,6 @@ main(void)
 #if defined H5_HAVE_WIN32_API && !defined (hdf5_EXPORTS)
     SKIPPED();
     puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
-#elif defined H5_VMS
-    SKIPPED();
 #else
     H5_FAILED()
     goto error;
diff --git a/test/gen_cross.c b/test/gen_cross.c
index 1c73016..2d4b788 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -22,6 +22,10 @@
  *  Run it on an OpenVMS, a little-endian, and a big-endian machine.  Change the
  *  output file names to vms_data.h5, le_data.h5, and be_data.h5, and put them
  *  under hdf5/test/ directory.
+ *
+ *  Note that we no longer support OpenVMS. The OpenVMS file will eventually
+ *  have to go away since we won't be able to re-create it but it's probably
+ *  worth keeping around for now.
  */
 
 #include <stdio.h>
diff --git a/test/getname.c b/test/getname.c
index dc1ddbe..e1bbc6b 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -2995,9 +2995,7 @@ main(void)
     nerrors += test_main(file_id, fapl);
     nerrors += test_obj_ref(fapl);
     nerrors += test_reg_ref(fapl);
-#ifndef H5_CANNOT_OPEN_TWICE
     nerrors += test_elinks(fapl);
-#endif /*H5_CANNOT_OPEN_TWICE*/
 
     /* Close file */
     H5Fclose(file_id);
diff --git a/test/lheap.c b/test/lheap.c
index bdb6360..492316e 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -179,11 +179,7 @@ main(void)
     {
         const char *testfile = H5_get_srcdir_filename(TESTFILE); /* Corrected test file name */
         hid_t dset = -1;
-#ifdef H5_VMS
-        file = H5Fopen(TESTFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
-#else
         file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT);
-#endif
         if(file >= 0){
             if((dset = H5Dopen2(file, "/Dataset1", H5P_DEFAULT)) < 0)
                 TEST_ERROR
diff --git a/test/links.c b/test/links.c
index cfbc4a1..ef71be7 100644
--- a/test/links.c
+++ b/test/links.c
@@ -36,13 +36,8 @@
 /* File for external link test.  Created with gen_udlinks.c */
 #define LINKED_FILE  "be_extlink2.h5"
 
-#ifdef H5_VMS
-#define TMPDIR          "[.tmp]"
-#define TMPDIR2         "[.tmp2]"
-#else /* H5_VMS */
 #define TMPDIR          "tmp/"
 #define TMPDIR2         "tmp2/"
-#endif /* H5_VMS */
 
 /* Symlinks for external link symlink test */
 #define SYMLINK1  TMPDIR "sym1.h5"
@@ -320,7 +315,7 @@ typedef struct {
  * Function:    fix_ext_filename
  *
  * Purpose:     Internal function to append path to file name.  It handles
- *              path name of Unix, Windows, and OpenVMS.
+ *              path name of Unix and Windows.
  *
  * Return:      void
  *
@@ -333,17 +328,8 @@ fix_ext_filename(char *path_name, char *cwd, const char *file_name)
 {
     HDstrcpy(path_name, cwd);
 
-#ifdef H5_VMS
-    if(file_name[0] == '[') {
-        char *tmp = file_name;
-        path_name[strlen(cwd)-1] = '\0';
-        HDstrcat(path_name, ++tmp);
-    } else
-        HDstrcat(path_name, file_name);
-#else
     HDstrcat(path_name, "/");
     HDstrcat(path_name, file_name);
-#endif
 }
 
 
@@ -2877,7 +2863,6 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
      * set up name for main file:
      *	Linux: "/CWD/tmp/extlinks0"
      *  Window: "<cur drive>:/CWD/tmp/extlinks0"
-     *  OpenVMS: "<cur disk>$<partition>:[CWD.tmp]extlinks0"
      */
     fix_ext_filename(tmpname, cwdpath, FILENAME[13]);
     h5_fixname(tmpname, fapl, filename1, sizeof filename1);
@@ -6943,7 +6928,6 @@ external_file_cache(hid_t fapl, hbool_t new_format)
     /* Verify that all files are now closed */
     H5F_sfile_assert_num(0);
 
-#ifndef H5_CANNOT_OPEN_TWICE
     /*
      * Test 5: 3 file cycle
      */
@@ -7045,7 +7029,6 @@ external_file_cache(hid_t fapl, hbool_t new_format)
 
     /* Verify that all files are now closed */
     H5F_sfile_assert_num(0);
-#endif /* H5_CANNOT_OPEN_TWICE */
 
     /* Close fapl */
     H5Pclose(my_fapl);
@@ -14580,15 +14563,11 @@ main(void)
                 printf("\n---Testing without external file cache---\n");
             } /* end else */
 
-#ifndef H5_CANNOT_OPEN_TWICE
             nerrors += external_link_root(my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
             nerrors += external_link_path(my_fapl, new_format) < 0 ? 1 : 0;
-#ifndef H5_CANNOT_OPEN_TWICE
             nerrors += external_link_self(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_link_pingpong(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_link_toomany(my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
             nerrors += external_link_dangling(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_link_recursive(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_link_query(my_fapl, new_format) < 0 ? 1 : 0;
@@ -14596,9 +14575,7 @@ main(void)
             nerrors += external_link_unlink_dense(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_link_move(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_link_ride(my_fapl, new_format) < 0 ? 1 : 0;
-#ifndef H5_CANNOT_OPEN_TWICE
             nerrors += external_link_closing(my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
             nerrors += external_link_endian(new_format) < 0 ? 1 : 0;
             nerrors += external_link_strong(my_fapl, new_format) < 0 ? 1 : 0;
 
@@ -14628,9 +14605,7 @@ main(void)
             nerrors += external_symlink(env_h5_drvr, my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_copy_invalid_object(my_fapl, new_format) < 0 ? 1 : 0;
             nerrors += external_dont_fail_to_source(my_fapl, new_format) < 0 ? 1 : 0;
-#ifndef H5_CANNOT_OPEN_TWICE
             nerrors += external_open_twice(my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
         } /* end for */
 
         /* These tests assume that external links are a form of UD links,
@@ -14654,9 +14629,7 @@ main(void)
         nerrors += obj_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
         nerrors += obj_visit_stop(my_fapl, new_format) < 0 ? 1 : 0;
         nerrors += link_filters(my_fapl, new_format) < 0 ? 1 : 0;
-#ifndef H5_CANNOT_OPEN_TWICE
         nerrors += obj_exists(my_fapl, new_format) < 0 ? 1 : 0;
-#endif /* H5_CANNOT_OPEN_TWICE */
 
         /* Keep this test last, it's testing files that are used above */
         /* do not do this for files used by external link tests */
diff --git a/test/links_env.c b/test/links_env.c
index 308d562..6e47667 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -25,11 +25,7 @@
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Lprivate.h"         /* Links                                */
 
-#ifdef H5_VMS
-#define TMPDIR          "[.tmp]"
-#else /* H5_VMS */
 #define TMPDIR          "tmp/"
-#endif /* H5_VMS */
 #define NAME_BUF_SIZE   1024
 
 const char *FILENAME[] = {
diff --git a/test/objcopy.c b/test/objcopy.c
index e84e70c..a73beb3 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -12276,9 +12276,7 @@ main(void)
         nerrors += test_copy_group_wide_loop(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
         nerrors += test_copy_group_links(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
         nerrors += test_copy_soft_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
-#ifndef H5_CANNOT_OPEN_TWICE
         nerrors += test_copy_ext_link(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
-#endif /* H5_CANNOT_OPEN_TWICE */
         nerrors += test_copy_exist(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
         nerrors += test_copy_path(fcpl_src, fcpl_dst, src_fapl, dst_fapl);
 
diff --git a/test/stab.c b/test/stab.c
index 48b58b1..95e9722 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -57,8 +57,6 @@ const char *FILENAME[] = {
 /* The group_old.h5 is generated from gen_old_fill.c in HDF5 'test' directory
  * for version 1.6.  To get this data file, simply compile gen_old_group.c with
  * the HDF5 library in that branch and run it. */
-/* I changed the name "group_old.h5.copy" to "group_old_copy.h5" because OpenVMS 
- * doesn't like any file name with more than one ".". SLU 2010/12/13 */ 
 #define FILE_OLD_GROUPS "group_old.h5"
 #define FILE_OLD_GROUPS_COPY "group_old_copy.h5"
 
diff --git a/test/tconfig.c b/test/tconfig.c
index f3ac242..14c863e 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -60,13 +60,6 @@ void test_exit_definitions(void);
  * Programmer:	Albert Cheng
  *              September 25, 2001
  *
- * Modifications:
- *              Raymond Lu
- *              16 Dec 2009
- *              On Boeing's OpenVMS, the value of EXIT_FAILURE is 268435458.
- *              (The test is in test_exit_definitions.)  Their document says
- *              it's supposed to be 2.  I commented it out for OpenVMS for
- *              further consideration.
  *-------------------------------------------------------------------------
  */
 void
@@ -75,9 +68,7 @@ test_configure(void)
     /* Output message about test being performed */
     MESSAGE(5, ("Testing configure definitions\n"));
     test_config_ctypes();
-#ifndef H5_VMS
     test_exit_definitions();
-#endif
 }
 
 
diff --git a/test/tfile.c b/test/tfile.c
index 52c8fd9..4913a15 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -181,19 +181,15 @@ test_file_create(void)
      * try to create the same file with H5F_ACC_TRUNC. This should fail
      * because fid1 is the same file and is currently open.
      */
-#ifndef H5_HAVE_FILE_VERSIONS
     fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     VERIFY(fid2, FAIL, "H5Fcreate");
-#endif /*H5_DONT_HAVE_FILE_VERSIONS*/
 
     /* Close all files */
     ret = H5Fclose(fid1);
     CHECK(ret, FAIL, "H5Fclose");
 
-#ifndef H5_HAVE_FILE_VERSIONS
     ret = H5Fclose(fid2);
     VERIFY(ret, FAIL, "H5Fclose"); /*file should not have been open */
-#endif /*H5_HAVE_FILE_VERSIONS*/
 
     /*
      * Try again with H5F_ACC_EXCL. This should fail because the file already
@@ -206,7 +202,6 @@ test_file_create(void)
     fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid1, FAIL, "H5Fcreate");
 
-#ifndef H5_HAVE_FILE_VERSIONS
     /*
      * Try to truncate first file again. This should fail because fid1 is the
      * same file and is currently open.
@@ -220,7 +215,6 @@ test_file_create(void)
      */
     fid2 = H5Fcreate(FILE1, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT);
     VERIFY(fid2, FAIL, "H5Fcreate");
-#endif /*H5_HAVE_FILE_VERSIONS*/
 
     /* Get the file-creation template */
     tmpl1 = H5Fget_create_plist(fid1);
@@ -1370,7 +1364,6 @@ test_file_perm(void)
     ret = H5Dclose(dset);
     CHECK(ret, FAIL, "H5Dclose");
 
-#ifndef H5_CANNOT_OPEN_TWICE
     /* Open the file (with read-only permission) */
     filero = H5Fopen(FILE2, H5F_ACC_RDONLY, H5P_DEFAULT);
     CHECK(filero, FAIL, "H5Fopen");
@@ -1387,7 +1380,6 @@ test_file_perm(void)
 
     ret = H5Fclose(filero);
     CHECK(ret, FAIL, "H5Fclose");
-#endif /*H5_CANNOT_OPEN_TWICE*/
 
     ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
@@ -2364,7 +2356,7 @@ test_rw_noupdate(void)
     /* Check That Timestamps Are Equal */
     if(diff > 0.0F) {
         /* Output message about test being performed */
-        MESSAGE(1, ("Testing to verify that nothing is written if nothing is changed: This test is skipped on this system because the modification time from stat is the same as the last access time (We know OpenVMS behaves in this way).\n"));
+        MESSAGE(1, ("Testing to verify that nothing is written if nothing is changed: This test is skipped on this system because the modification time from stat is the same as the last access time.\n"));
     } /* end if */
     else {
         hid_t file_id;      /* HDF5 File ID */
@@ -3660,16 +3652,12 @@ test_file(void)
     test_file_freespace();      /* Test file free space information */
     test_file_ishdf5();         /* Test detecting HDF5 files correctly */
     test_file_open_dot();       /* Test opening objects with "." for a name */
-#ifndef H5_CANNOT_OPEN_TWICE
     test_file_open_overlap();   /* Test opening files in an overlapping manner */
-#endif /*H5_CANNOT_OPEN_TWICE*/
     test_file_getname();        /* Test basic H5Fget_name() functionality */
-#ifndef H5_CANNOT_OPEN_TWICE
     test_file_double_root_open();       /* Test opening root group from two files works properly */
     test_file_double_group_open();      /* Test opening same group from two files works properly */
     test_file_double_dataset_open();    /* Test opening same dataset from two files works properly */
     test_file_double_datatype_open();   /* Test opening same named datatype from two files works properly */
-#endif /*H5_CANNOT_OPEN_TWICE*/
     test_userblock_file_size(); /* Tests that files created with a userblock have the correct size */
     test_cached_stab_info();    /* Tests that files are created with cached stab info in the superblock */
     test_rw_noupdate();         /* Test to ensure that RW permissions don't write the file unless dirtied */
diff --git a/test/th5o.c b/test/th5o.c
index be3b4ab..40844fa 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -1355,9 +1355,7 @@ test_h5o(void)
     test_h5o_link();            /* Test object link routine */
     test_h5o_comment();         /* Test routines for comment */
     test_h5o_comment_by_name(); /* Test routines for comment by name */
-#ifndef  H5_CANNOT_OPEN_TWICE   /* OpenVMS can't open a file twice */
     test_h5o_getinfo_same_file(); /* Test info for objects in the same file */
-#endif /* H5_CANNOT_OPEN_TWICE */
 } /* test_h5o() */
 
 
diff --git a/test/th5s.c b/test/th5s.c
index 1560ef4..9d08abe 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -2326,6 +2326,48 @@ test_h5s_extent_copy(void)
 
 /****************************************************************
 **
+**  test_h5s_bug1(): Test Creating dataspace with H5Screate then
+*                    setting extent with H5Sextent_copy.
+**
+****************************************************************/
+static void
+test_h5s_bug1(void)
+{
+    hid_t space1;               /* Dataspace to copy extent to */
+    hid_t space2;               /* Scalar dataspace */
+    hsize_t dims[2] = {10, 10}; /* Dimensions */
+    hsize_t start[2] = {0, 0};  /* Hyperslab start */
+    htri_t select_valid;        /* Whether the dataspace selection is valid */
+    herr_t ret;                 /* Generic error return */
+
+    /* Create dataspaces */
+    space1 = H5Screate(H5S_SIMPLE);
+    CHECK(space1, FAIL, "H5Screate");
+    space2 = H5Screate_simple(2, dims, NULL);
+    CHECK(space2, FAIL, "H5Screate");
+
+    /* Copy extent to space1 */
+    ret = H5Sextent_copy(space1, space2);
+    CHECK(ret, FAIL, "H5Sextent_copy");
+
+    /* Select hyperslab in space1 containing entire extent */
+    ret = H5Sselect_hyperslab(space1, H5S_SELECT_SET, start, NULL, dims, NULL);
+    CHECK(ret, FAIL, "H5Sselect_hyperslab");
+
+    /* Check that space1's selection is valid */
+    select_valid = H5Sselect_valid(space1);
+    CHECK(select_valid, FAIL, "H5Sselect_valid");
+    VERIFY(select_valid, TRUE, "H5Sselect_valid result");
+
+    /* Close dataspaces */
+    ret = H5Sclose(space1);
+    CHECK(ret, FAIL, "H5Sclose");
+    ret = H5Sclose(space2);
+    CHECK(ret, FAIL, "H5Sclose");
+} /* test_h5s_bug1() */
+
+/****************************************************************
+**
 **  test_h5s(): Main H5S (dataspace) testing routine.
 **
 ****************************************************************/
@@ -2350,6 +2392,7 @@ test_h5s(void)
 
     test_h5s_extent_equal();	/* Test extent comparison code */
     test_h5s_extent_copy();     /* Test extent copy code */
+    test_h5s_bug1();            /* Test bug in offset initialization */
 } /* test_h5s() */
 
 
diff --git a/test/tsohm.c b/test/tsohm.c
index 9da655e..e22940f 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -3988,10 +3988,7 @@ test_sohm(void)
     test_sohm_delete();         /* Test deleting shared messages */
     test_sohm_delete_revert();  /* Test that a file with SOHMs becomes an
                                  * empty file again when they are deleted. */
-#ifndef  H5_CANNOT_OPEN_TWICE   /* On VMS this test fails since it tries to
-                                   open target file the second time */
     test_sohm_extlink();        /* Test SOHMs when external links are used */
-#endif /* H5_CANNOT_OPEN_TWICE */
 
     test_sohm_extend_dset();    /* Test extending shared datasets */
     test_sohm_external_dtype(); /* Test using datatype in another file */
diff --git a/test/ttsafe.c b/test/ttsafe.c
index d0ab81a..d3c5cfb 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -40,13 +40,6 @@
 /* ANY new test needs to have a prototype in ttsafe.h */
 #include "ttsafe.h"
 
-#ifndef H5_HAVE_THREADSAFE
-int main(void)
-{
-    printf("Test skipped because THREADSAFE not enabled\n");
-    return 0;
-}
-#else
 
 #define MAX_NUM_NAME 1000
 #define NAME_OFFSET 6         /* offset for "name<num>" */
@@ -66,6 +59,30 @@ num_digits(int num)
     return u;
 }
 
+/* Test the H5is_library_threadsafe() function */
+void
+tts_is_threadsafe(void)
+{
+    hbool_t is_ts;
+    hbool_t should_be;
+
+#ifdef H5_HAVE_THREADSAFE
+    is_ts = FALSE;
+    should_be = TRUE;
+#else /* H5_HAVE_THREADSAFE */
+    is_ts = TRUE;
+    should_be = FALSE;
+#endif /* H5_HAVE_THREADSAFE */
+
+    if(H5is_library_threadsafe(&is_ts) != SUCCEED)
+            TestErrPrintf("H5_is_library_threadsafe() call failed - test failed\n");
+
+    if(is_ts != should_be)
+            TestErrPrintf("Thread-safety value incorrect - test failed\n");
+
+    return;
+}
+
 /* Routine to generate attribute names for numeric values */
 char *gen_name(int value)
 {
@@ -88,10 +105,13 @@ char *gen_name(int value)
 
 int main(int argc, char *argv[])
 {
+
     /* Initialize testing framework */
     TestInit(argv[0], NULL, NULL);
 
     /* Tests are generally arranged from least to most complexity... */
+    AddTest("is_threadsafe", tts_is_threadsafe, NULL, "library threadsafe status", NULL);
+#ifdef H5_HAVE_THREADSAFE
     AddTest("dcreate", tts_dcreate, cleanup_dcreate, "multi-dataset creation", NULL);
     AddTest("error", tts_error, cleanup_error, "per-thread error stacks", NULL);
 #ifdef H5_HAVE_PTHREAD_H    
@@ -100,6 +120,12 @@ int main(int argc, char *argv[])
 #endif /* H5_HAVE_PTHREAD_H */
     AddTest("acreate", tts_acreate, cleanup_acreate, "multi-attribute creation", NULL);
 
+#else /* H5_HAVE_THREADSAFE */
+
+    printf("Most thread-safety tests skipped because THREADSAFE not enabled\n");
+
+#endif /* H5_HAVE_THREADSAFE */
+
     /* Display testing information */
     TestInfo(argv[0]);
 
@@ -118,5 +144,6 @@ int main(int argc, char *argv[])
         TestCleanup();
 
     return GetTestNumErrs();
+
 } /* end main() */
-#endif  /*H5_HAVE_THREADSAFE*/
+
diff --git a/test/ttsafe.h b/test/ttsafe.h
index b4826fc..f2e9e86 100644
--- a/test/ttsafe.h
+++ b/test/ttsafe.h
@@ -20,8 +20,6 @@
 #ifndef TTSAFE_H
 #define TTSAFE_H
 
-#include <string.h>
-
 /*
  * Include required headers.  This file tests internal library functions,
  * so we include the private headers here.
@@ -31,16 +29,13 @@
 #include "H5Eprivate.h"
 #include "testhdf5.h"
 
-#ifdef H5_HAVE_THREADSAFE
-/* Include pthread library for threadsafe tests */
-#ifdef H5_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif /* H5_HAVE_PTHREAD_H */
 
 /* Prototypes for the support routines */
 extern char*            gen_name(int);
 
 /* Prototypes for the test routines */
+void                    tts_is_threadsafe(void);
+#ifdef H5_HAVE_THREADSAFE
 void                    tts_dcreate(void);
 void                    tts_error(void);
 void                    tts_cancel(void);
@@ -54,3 +49,4 @@ void                    cleanup_acreate(void);
 
 #endif /* H5_HAVE_THREADSAFE */
 #endif /* TTSAFE_H */
+
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index e143263..a2f25db 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -231,3 +231,4 @@ void cleanup_error(void)
 }
 
 #endif /*H5_HAVE_THREADSAFE*/
+