Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit 'cee9624b0febcb60a7b2699262104e9eaf20313d':
  output_filter.sh:         Comment added to address HDFFV-8270.  The sample ontput in the         file's comments are not up-to-date with the scripts in the file         that remove output unique to certain systems when running test         scripts.  This output doesn't match expected output files for         the tests, causing them to fail.  Ther output_filter.sh file         removes such output.  Currently we don't have access to these         systems to update the comments.
  Correct double sourcedir name on copied datafiles.

3 files changed, 39 insertions, 11 deletions

diff --git a/bin/output_filter.sh b/bin/output_filter.sh
index 58f1c48..35af819 100644
--- a/bin/output_filter.sh
+++ b/bin/output_filter.sh
@@ -17,6 +17,21 @@
 # Created Date: 2011/5/3
 
 
+# Comment added to address HDFFV-8270:
+# As I understand it, the purpose of this file is to remove extraneous messages 
+# that appear in stdout and stderr on some machines that have been tested outside 
+# of the HDF Group realm.  The purpose of this script is to filter those 
+# extraneous messages from stdout and stderr so that when the output files are
+# compared to the expected output, the extra messages will not cause failures in 
+# the tests.  The system messages in the comments below are out of date, meaning
+# I suppose that while the script code to filter messages on the system was 
+# correct correct when last used, the output in the comments doesn't match the
+# script code that follows.  I don't currently have access to any of these 
+# systems to see the current output and the effect of the script code. If using
+# this file in the future, please update the comments to match the scripts in use.
+# Larry Knox 2017/3/15
+
+
 # Some systems will dump some messages to stdout for various reasons.
 # Remove them from the stdout result file.
 # $1 is the file name of the file to be filtered.
diff --git a/test/testflushrefresh.sh.in b/test/testflushrefresh.sh.in
index 83b7134..e7917a0 100644
--- a/test/testflushrefresh.sh.in
+++ b/test/testflushrefresh.sh.in
@@ -79,11 +79,22 @@ if [ $rc -ne 0 ] ; then
     exit 0
 fi
 
-# ========================
-# Launch the Test Program.
-# ========================
-./flushrefresh &
-pid_main=$!
+# HDF5 has several tests that create and delete signal files to communicate
+# between processes, and it seems that even though the names of the files are
+# different, occasionally the wrong file is deleted, interrupting the flow of
+# the test.  Running each of these tests in its own directory should eliminate 
+# the problem.
+mkdir -p flushrefresh_test/.libs
+cp flushrefresh flushrefresh_test
+
+# With the --disable-shared option, flushrefresh is built in the test directory,
+# otherwise it is in test/.libs with a wrapper script named flushrefresh in 
+# the test directory.  test/flushrefresh should always be copied, 
+# .libs/flushrefresh should be copied only if it exists.
+if [ -f .libs/flushrefresh ]; then
+    cp .libs/flushrefresh flushrefresh_test/.libs
+fi
+cd flushrefresh_test
 
 # =================================================
 # Set up/initialize some variables to be used later 
@@ -98,6 +109,12 @@ if [ -e $testfile ]; then
     rm $testfile
 fi
 
+# ========================
+# Launch the Test Program.
+# ========================
+./flushrefresh &
+pid_main=$!
+
 # =======================================
 # Run flush verification on test program.
 # =======================================
diff --git a/test/tfile.c b/test/tfile.c
index 295a29c..7edc40c 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -4465,10 +4465,8 @@ test_filespace_1_10_0_compatible(void)
     MESSAGE(5, ("File space compatibility testing for 1.10.0 files\n"));
 
     for(j = 0; j < NELMTS(OLD_1_10_0_FILENAME); j++) {
-        const char *filename = H5_get_srcdir_filename(OLD_1_10_0_FILENAME[j]); /* Corrected test file name */
-
         /* Make a copy of the test file */
-        status = h5_make_local_copy(filename, FILE5);
+        status = h5_make_local_copy(OLD_1_10_0_FILENAME[j], FILE5);
 	CHECK(status, FAIL, "h5_make_local_copy");
 
         /* Open the temporary test file */
@@ -4779,10 +4777,8 @@ test_filespace_round_compatible(void)
     MESSAGE(5, ("File space compatibility testing for files from trunk to 1_8 to trunk\n"));
 
     for(j = 0; j < NELMTS(FSPACE_FILENAMES); j++) {
-        const char *filename = H5_get_srcdir_filename(FSPACE_FILENAMES[j]);
-
         /* Make a copy of the test file */
-        status = h5_make_local_copy(filename, FILE5);
+        status = h5_make_local_copy(FSPACE_FILENAMES[j], FILE5);
 	CHECK(status, FAIL, "h5_make_local_copy");
 
 	/* Open the temporary test file */