[svn-r25844] Fix for SWMR-15: eliminate the "Terminated" message from kill when testing h5watch:

--Use signal handler to catch SIGTERM and SIGINT.
Also remove redundant tests to lessen the possibility of failures due to timing in catching h5watch output.

16 files changed, 54 insertions, 305 deletions

diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index d49c5f6..a75ed30 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -665,6 +665,7 @@ usage(const char *prog)
     HDfprintf(stdout, "        <path_to_dataset>     Path separated by slashes to the specified dataset\n");
     HDfprintf(stdout, "        <dsetname>            Name of the dataset\n");
     HDfprintf(stdout, "\n");
+    HDfprintf(stdout, "     User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM).\n");
 
 } /* usage() */
 
@@ -779,6 +780,27 @@ parse_command_line(int argc, const char *argv[])
     }
 } /* parse_command_line() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:    catch_signal
+ *
+ * Purpose:     The signal handler to catch the signals:
+ *		SIGTERM and SIGINT and exit from h5watch
+ *
+ * Return:      No return
+ *
+ * Programmer:  Vailin Choi; November 2014
+ *
+ *-------------------------------------------------------------------------
+ */
+static void catch_signal(int UNUSED signo)
+{
+    /* Exit from h5watch */
+    leave(EXIT_SUCCESS);
+
+} /* catch_signal() */
+
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -814,6 +836,18 @@ main(int argc, const char *argv[])
     /* Initialize h5tools lib */
     h5tools_init();
 
+    /* To exit from h5watch for SIGTERM signal */
+    if(HDsignal(SIGTERM, catch_signal) == SIG_ERR) {
+	error_msg("An error occurred while setting a signal handler.\n");
+	leave(EXIT_FAILURE);
+    }
+
+    /* To exit from h5watch for SIGINT signal */
+    if(HDsignal(SIGINT, catch_signal) == SIG_ERR) {
+        error_msg("An error occurred while setting a signal handler.\n");
+	leave(EXIT_FAILURE);
+    }
+
     /* parse command line options */
     parse_command_line(argc, argv);
 
diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in
index 377dd89..324ddb3 100644
--- a/hl/tools/h5watch/testh5watch.sh.in
+++ b/hl/tools/h5watch/testh5watch.sh.in
@@ -192,6 +192,7 @@ TEST_WATCH() {
         extend_exit=$?                                  # Collect "extend" process' exit code
         sleep 1                                         # Sleep to make sure output is flushed
         kill $watch_pid                                 # Kill h5watch
+	wait $watch_pid					# Wait for "h5watch" process to complete
         #
         if [ $extend_exit -ne 0 ]; then                 # Error returned from "extend" process
             $ECHO "*FAILED*"
@@ -321,57 +322,30 @@ echo "DONE WITH 2nd SET OF TESTS"
 #
 # Watching and extending: (TEST.h5 is a copy of WATCH.h5)
 #       TEST.h5/DSET_CMPD with --fields=field1,field2
-#       TEST.h5/DSET_CMP_TWO with --fields=field1,field2
-#       TEST.h5/DSET_CMPD_ESC with --fields=field\,1,field2\.
-#       TEST.h5/DSET_CMPD with --fields=field1 --fields=field2
-#       TEST.h5/DSET_CMPD_ESC with --fields=field\,1 --fields=field2\.
-#       TEST.h5/DSET_CMPD_TWO with --fields=field1 --fields=field2
-#
+#       TEST.h5/DSET_CMPD with --fields=field2.b,field4
+#       TEST.h5/DSET_CMPD with --fields=field2.b.a --fields=field2.c
 TEST_WATCH DSET_CMPD --fields=field1,field2 w-ext-cmpd-f1.ddl
-TEST_WATCH DSET_CMPD_TWO --fields=field1,field2 w-ext-cmpd-two-f1.ddl
-TEST_WATCH DSET_CMPD_ESC '--fields=field\,1,field2\.' w-ext-cmpd-esc-f1.ddl
-TEST_WATCH DSET_CMPD '--fields=field1 --fields=field2' w-ext-cmpd-ff1.ddl
-TEST_WATCH DSET_CMPD_ESC '--fields=field\,1 --fields=field2\.' w-ext-cmpd-esc-ff1.ddl
-TEST_WATCH DSET_CMPD_TWO '--fields=field1 --fields=field2' w-ext-cmpd-two-ff1.ddl
-#
-echo "DONE WITH 3rd SET OF TESTS"
-#
+TEST_WATCH DSET_CMPD --fields=field2.b,field4 w-ext-cmpd-f2.ddl
+TEST_WATCH DSET_CMPD '--fields=field2.b.a --fields=field2.c' w-ext-cmpd-ff3.ddl
 #
 #
-# Watching and extending: (TEST.h5 is a copy of WATCH.h5)
-#       TEST.h5/DSET_CMPD with --fields=field2.b,field4
-#       TEST.h5/DSET_CMPD_ESC with --fields=field2\..\,b,field4\
-#       TEST.h5/DSET_CMPD_TWO with --fields=field2.b,field4
-#       TEST.h5/DSET_CMPD with --fields=field2.b --fields=field4
-#       TEST.h5/DSET_CMPD_ESC with --fields=field2\..\,b --fields=field4\,
+#       TEST.h5/DSET_CMP_TWO with --fields=field1,field2
 #       TEST.h5/DSET_CMPD_TWO with --fields=field2.b --fields=field4
-#
-TEST_WATCH DSET_CMPD --fields=field2.b,field4 w-ext-cmpd-f2.ddl
-TEST_WATCH DSET_CMPD_ESC '--fields=field2\..\,b,field4\,' w-ext-cmpd-esc-f2.ddl
-TEST_WATCH DSET_CMPD_TWO --fields=field2.b,field4 w-ext-cmpd-two-f2.ddl
-TEST_WATCH DSET_CMPD '--fields=field2.b --fields=field4' w-ext-cmpd-ff2.ddl
-TEST_WATCH DSET_CMPD_ESC '--fields=field2\..\,b --fields=field4\,' w-ext-cmpd-esc-ff2.ddl
+#       TEST.h5/DSET_CMPD_TWO with --fields=field2.b.a,field2.c
+TEST_WATCH DSET_CMPD_TWO --fields=field1,field2 w-ext-cmpd-two-f1.ddl
 TEST_WATCH DSET_CMPD_TWO '--fields=field2.b --fields=field4' w-ext-cmpd-two-ff2.ddl
-#
-echo "DONE WITH 4th SET OF TESTS"
-#
+TEST_WATCH DSET_CMPD_TWO --fields=field2.b.a,field2.c w-ext-cmpd-two-f3.ddl
 #
 #
-# Watching and extending: (TEST.h5 is a copy of WATCH.h5)
-#       TEST.h5/DSET_CMPD with --fields=field2.b.a,field2.c
+#       TEST.h5/DSET_CMPD_ESC with --fields=field\,1,field2\.
+#       TEST.h5/DSET_CMPD_ESC with --fields=field2\..\,b --fields=field4\,
 #       TEST.h5/DSET_CMPD_ESC with --fields=field2\..\,b.a,field2\..\\K
-#       TEST.h5/DSET_CMPD_TWO with --fields=field2.b.a,field2.c
-#       TEST.h5/DSET_CMPD with --fields=field2.b.a --fields=field2.c
-#       TEST.h5/DSET_CMPD_ESC with --fields=field2\..\,b.a --fields=field2\..\\K
-#       TEST.h5/DSET_CMPD_TWO with --fields=field2.b.a --fields=field2.c
-TEST_WATCH DSET_CMPD --fields=field2.b.a,field2.c w-ext-cmpd-f3.ddl
+TEST_WATCH DSET_CMPD_ESC '--fields=field\,1,field2\.' w-ext-cmpd-esc-f1.ddl
+TEST_WATCH DSET_CMPD_ESC '--fields=field2\..\,b --fields=field4\,' w-ext-cmpd-esc-ff2.ddl
 TEST_WATCH DSET_CMPD_ESC '--fields=field2\..\,b.a,field2\..\\K' w-ext-cmpd-esc-f3.ddl
-TEST_WATCH DSET_CMPD_TWO --fields=field2.b.a,field2.c w-ext-cmpd-two-f3.ddl
-TEST_WATCH DSET_CMPD '--fields=field2.b.a --fields=field2.c' w-ext-cmpd-ff3.ddl
-TEST_WATCH DSET_CMPD_ESC '--fields=field2\..\,b.a --fields=field2\..\\K' w-ext-cmpd-esc-ff3.ddl
-TEST_WATCH DSET_CMPD_TWO '--fields=field2.b.a --fields=field2.c' w-ext-cmpd-two-ff3.ddl
 #
-echo "DONE WITH 5th SET OF TESTS"
+#
+echo "DONE WITH 3rd SET OF TESTS"
 #
 #
 #
@@ -393,7 +367,7 @@ TEST_WATCH DSET_TWO --width=30 w-ext-two-width.ddl
 TEST_WATCH DSET_CMPD --label w-ext-cmpd-label.ddl
 TEST_WATCH DSET_ONE --simple w-ext-one-simple.ddl
 #
-echo "DONE WITH 6th SET OF TESTS"
+echo "DONE WITH 4th SET OF TESTS"
 #
 #
 #
diff --git a/hl/tools/testfiles/w-err-poll.ddl b/hl/tools/testfiles/w-err-poll.ddl
index 4395cc4..56c8d89 100644
--- a/hl/tools/testfiles/w-err-poll.ddl
+++ b/hl/tools/testfiles/w-err-poll.ddl
@@ -35,3 +35,4 @@ Usage: h5watch [OPTIONS] [OBJECT]
         <path_to_dataset>     Path separated by slashes to the specified dataset
         <dsetname>            Name of the dataset
 
+     User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM).
diff --git a/hl/tools/testfiles/w-err-poll0.ddl b/hl/tools/testfiles/w-err-poll0.ddl
index c71f1eb..ff6f322 100644
--- a/hl/tools/testfiles/w-err-poll0.ddl
+++ b/hl/tools/testfiles/w-err-poll0.ddl
@@ -35,3 +35,4 @@ Usage: h5watch [OPTIONS] [OBJECT]
         <path_to_dataset>     Path separated by slashes to the specified dataset
         <dsetname>            Name of the dataset
 
+     User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM).
diff --git a/hl/tools/testfiles/w-err-width.ddl b/hl/tools/testfiles/w-err-width.ddl
index a16b641..bf405a4 100644
--- a/hl/tools/testfiles/w-err-width.ddl
+++ b/hl/tools/testfiles/w-err-width.ddl
@@ -35,3 +35,4 @@ Usage: h5watch [OPTIONS] [OBJECT]
         <path_to_dataset>     Path separated by slashes to the specified dataset
         <dsetname>            Name of the dataset
 
+     User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM).
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f2.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-f2.ddl
deleted file mode 100644
index cde31f2..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-esc-f2.ddl
+++ /dev/null
@@ -1,14 +0,0 @@
-#############################
- output for 'h5watch --fields=field2\..\,b,field4\, TEST.h5/DSET_CMPD_ESC'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD_ESC...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}, {{{4, 4, 4}}, {6, 
-        (12)  6}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff1.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-ff1.ddl
deleted file mode 100644
index e37e010..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-esc-ff1.ddl
+++ /dev/null
@@ -1,14 +0,0 @@
-#############################
- output for 'h5watch --fields=field\,1 --fields=field2\. TEST.h5/DSET_CMPD_ESC'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD_ESC...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}},
-        (12) {3, {4, {4, 4, 4}, 4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff3.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-ff3.ddl
deleted file mode 100644
index 5b6c5e6..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-esc-ff3.ddl
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
- output for 'h5watch --fields=field2\..\,b.a --fields=field2\..\\K TEST.h5/DSET_CMPD_ESC'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD_ESC...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {{{2}}, {2}}, {{{3}}, {3}}, {{{4}}, {4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2}}, {2}}, {{{3}}, {3}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-f3.ddl b/hl/tools/testfiles/w-ext-cmpd-f3.ddl
deleted file mode 100644
index a94b365..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-f3.ddl
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
- output for 'h5watch --fields=field2.b.a,field2.c TEST.h5/DSET_CMPD'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {{{2}}, {2}}, {{{3}}, {3}}, {{{4}}, {4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2}}, {2}}, {{{3}}, {3}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-ff1.ddl b/hl/tools/testfiles/w-ext-cmpd-ff1.ddl
deleted file mode 100644
index dcefb7a..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-ff1.ddl
+++ /dev/null
@@ -1,14 +0,0 @@
-#############################
- output for 'h5watch --fields=field1 --fields=field2 TEST.h5/DSET_CMPD'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}},
-        (12) {3, {4, {4, 4, 4}, 4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-ff2.ddl b/hl/tools/testfiles/w-ext-cmpd-ff2.ddl
deleted file mode 100644
index ecb8fcb..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-ff2.ddl
+++ /dev/null
@@ -1,14 +0,0 @@
-#############################
- output for 'h5watch --fields=field2.b --fields=field4 TEST.h5/DSET_CMPD'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}, {{{4, 4, 4}}, {6, 
-        (12)  6}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f2.ddl b/hl/tools/testfiles/w-ext-cmpd-two-f2.ddl
deleted file mode 100644
index 4404b71..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-two-f2.ddl
+++ /dev/null
@@ -1,50 +0,0 @@
-#############################
- output for 'h5watch --fields=field2.b,field4 TEST.h5/DSET_CMPD_TWO'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD_TWO...
-dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
-    Data:
-        (0,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (1,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (2,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (3,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (4,0) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,2) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,4) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,6) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,8) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,0) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,2) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,4) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,6) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,8) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {{{2, 2, 2}}, {2, 2}},
-        (7,0) {{{2, 2, 2}}, {2, 2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {{{3, 3, 3}}, {3, 3}},
-        (9,0) {{{3, 3, 3}}, {3, 3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {{{4, 4, 4}}, {4, 4}}, {{{4, 4, 4}}, {4, 4}}
-        (1,1) {{{4, 4, 4}}, {4, 4}}, {{{4, 4, 4}}, {4, 4}}
-        (2,1) {{{4, 4, 4}}, {4, 4}}, {{{4, 4, 4}}, {4, 4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {{{7, 7, 7}}, {7, 7}}, {{{7, 7, 7}}, {7, 7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff1.ddl b/hl/tools/testfiles/w-ext-cmpd-two-ff1.ddl
deleted file mode 100644
index 81d91a7..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-two-ff1.ddl
+++ /dev/null
@@ -1,50 +0,0 @@
-#############################
- output for 'h5watch --fields=field1 --fields=field2 TEST.h5/DSET_CMPD_TWO'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD_TWO...
-dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
-    Data:
-        (0,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (1,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (2,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (3,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (4,0) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,2) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,4) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,6) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,8) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,0) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,2) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,4) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,6) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,8) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {2, {2, {2, 2, 2}, 2}},
-        (7,0) {2, {2, {2, 2, 2}, 2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {3, {3, {3, 3, 3}, 3}},
-        (9,0) {3, {3, {3, 3, 3}, 3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {4, {4, {4, 4, 4}, 4}}, {4, {4, {4, 4, 4}, 4}}
-        (1,1) {4, {4, {4, 4, 4}, 4}}, {4, {4, {4, 4, 4}, 4}}
-        (2,1) {4, {4, {4, 4, 4}, 4}}, {4, {4, {4, 4, 4}, 4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {7, {7, {7, 7, 7}, 7}}, {7, {7, {7, 7, 7}, 7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff3.ddl b/hl/tools/testfiles/w-ext-cmpd-two-ff3.ddl
deleted file mode 100644
index 86c255d..0000000
--- a/hl/tools/testfiles/w-ext-cmpd-two-ff3.ddl
+++ /dev/null
@@ -1,44 +0,0 @@
-#############################
- output for 'h5watch --fields=field2.b.a --fields=field2.c TEST.h5/DSET_CMPD_TWO'
-#############################
-Opened "TEST.h5" with sec2 driver.
-Monitoring dataset /DSET_CMPD_TWO...
-dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
-    Data:
-        (0,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (1,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (2,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (3,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (4,0) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (4,4) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (4,8) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (5,0) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (5,4) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (5,8) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {{{2}}, {2}},
-        (7,0) {{{2}}, {2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {{{3}}, {3}},
-        (9,0) {{{3}}, {3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {{{4}}, {4}}, {{{4}}, {4}}
-        (1,1) {{{4}}, {4}}, {{{4}}, {4}}
-        (2,1) {{{4}}, {4}}, {{{4}}, {4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {{{7}}, {7}}, {{{7}}, {7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
diff --git a/hl/tools/testfiles/w-help1.ddl b/hl/tools/testfiles/w-help1.ddl
index 27678cf..8e75242 100644
--- a/hl/tools/testfiles/w-help1.ddl
+++ b/hl/tools/testfiles/w-help1.ddl
@@ -35,3 +35,4 @@ Usage: h5watch [OPTIONS] [OBJECT]
         <path_to_dataset>     Path separated by slashes to the specified dataset
         <dsetname>            Name of the dataset
 
+     User can end the h5watch process by ctrl-C (SIGINT) or kill the process (SIGTERM).
diff --git a/hl/tools/testfiles/w-help2.ddl b/hl/tools/testfiles/w-help2.ddl
deleted file mode 100644
index 1dff44e..0000000
--- a/hl/tools/testfiles/w-help2.ddl
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################
- output for 'h5watch --help'
-#############################
-Usage: h5watch [OPTIONS] [OBJECT]
-
-     OPTIONS
-        -h, --help            Print a usage message and exit.
-        -V, --version         Print version number and exit.
-        -l, --label           Label members of compound typed dataset.
-        -S, --simple          Use a machine-readable output format.
-        -d, --dim             Monitor changes in size of dataset dimensions only.
-        -wN, --width=N        Set the number of columns to N for output.
-                              A value of 0 sets the number of columns to the
-                              maximum (65535). The default width is 80 columns.
-        -pN, --polling=N      Set the polling interval to N (in seconds) when the
-                              dataset will be checked for appended data.  The default
-                              polling interval is 1.
-        -f<list_of_fields>, --fields=<list_of_fields>
-                              Display data for the fields specified in <list_of_fields>
-                              for a compound data type.  <list_of_fields> can be
-                              specified as follows:
-                                   1) A comma-separated list of field names in a
-                                   compound data type.  "," is the separator
-                                   for field names while "." is the separator
-                                   for a nested field.
-                                   2) A single field name in a compound data type.
-                                   Can use this option multiple times.
-                              Note that backslash is the escape character to avoid
-                              characters in field names that conflict with the tool's
-                              separators.
-
-     OBJECT is specified as [<filename>/<path_to_dataset>/<dsetname>]
-        <filename>            Name of the HDF5 file.  It may be preceded by path
-                              separated by slashes to the specified HDF5 file.
-        <path_to_dataset>     Path separated by slashes to the specified dataset
-        <dsetname>            Name of the dataset
-