From aa5e822273ca13a833ece003706541b7d73829e3 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@unidata.ucar.edu>
Date: Wed, 10 Jul 2013 21:19:05 +0000
Subject: [PATCH] added tst_h_scalar test

---
 cf                           | 4 ++--
 ncdump/Makefile.am           | 4 ++--
 ncdump/expected4/Makefile.am | 2 +-
 ncdump/tst_ncgen4.sh         | 9 +++++++++
 ncdump/tst_ncgen4_shared.sh  | 9 +++++++++
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/cf b/cf
index 0fcfcbdb7..02cf25566 100644
--- a/cf
+++ b/cf
@@ -16,8 +16,8 @@ DAP=1
 #M32=1
 #M64=1
 
-INSTALL=1
-PREFIX=/usr/local
+#INSTALL=1
+#PREFIX=/usr/local
 
 if test "x$cmds" = x ; then
 cmds=""
diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am
index f27038a64..b0ea85b45 100644
--- a/ncdump/Makefile.am
+++ b/ncdump/Makefile.am
@@ -42,13 +42,13 @@ if USE_NETCDF4
 check_PROGRAMS += tst_create_files tst_h_rdc0 tst_group_data		\
 tst_enum_data tst_opaque_data tst_string_data tst_vlen_data tst_comp	\
 tst_comp2 tst_nans tst_special_atts tst_unicode tst_fillbug tst_compress \
-tst_chunking 
+tst_chunking tst_h_scalar
 
 TESTS += tst_create_files tst_group_data tst_enum_data tst_opaque_data	\
 tst_string_data tst_vlen_data tst_comp tst_comp2 tst_nans		\
 tst_special_atts tst_netcdf4.sh tst_h_rdc0 tst_unicode tst_fillbug	\
 tst_fillbug.sh tst_netcdf4_4.sh tst_compress tst_nccopy4.sh             \
-tst_grp_spec.sh tst_mud.sh
+tst_grp_spec.sh tst_mud.sh tst_h_scalar tst_h_scalar.sh
 
 if EXTRA_TESTS
 TESTS += run_back_comp_tests.sh
diff --git a/ncdump/expected4/Makefile.am b/ncdump/expected4/Makefile.am
index 062f56349..c074fb29a 100644
--- a/ncdump/expected4/Makefile.am
+++ b/ncdump/expected4/Makefile.am
@@ -20,7 +20,7 @@ simple_xy.dmp small.dmp small2.dmp test0.dmp tst_ncml.dmp \
 n3time.dmp ref_tst_special_atts3.dmp ref_tst_chardata.dmp ref_tst_unlim2.dmp \
 ref_solar.dmp unlimtest1.dmp unlimtest2.dmp \
 ref_tst_vlen_data.dmp ref_tst_vlen_data2.dmp \
-ref_niltest.dmp
+ref_niltest.dmp ref_tst_h_scalar.dmp
 
 # These do not exist because they are not run as usual tests
 # bigf1.dmp bigf2.dmp bigf3.dmp bigr1.dmp bigr2.dmp bigr3.dmp gfs1.dmp
diff --git a/ncdump/tst_ncgen4.sh b/ncdump/tst_ncgen4.sh
index 83229e149..ce3a779df 100755
--- a/ncdump/tst_ncgen4.sh
+++ b/ncdump/tst_ncgen4.sh
@@ -2,6 +2,15 @@
 verbose=1
 set -e
 
+# To add a new test,
+# 1. put the .cdl file in the 'cdl4' directory
+# 2. put the result of running ncgen then ncdump
+#    into the directory 'expected4' as .dmp
+# 3. Modify the file tst_ncgen4_shared.sh to add
+#    the test to the end of the TESTS4 variable
+# 4. Add the new files into cdl4/Makfile.am
+#    and expected4/Makefile.am 
+
 if test "x$builddir" = "x"; then builddir=`pwd`; fi
 if test "x$srcdir" = "x"; then srcdir=`dirname $0`; fi
 
diff --git a/ncdump/tst_ncgen4_shared.sh b/ncdump/tst_ncgen4_shared.sh
index a16d3185a..f41d76deb 100644
--- a/ncdump/tst_ncgen4_shared.sh
+++ b/ncdump/tst_ncgen4_shared.sh
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+# To add a new test,
+# 1. put the .cdl file in the 'cdl4' directory
+# 2. put the result of running ncgen then ncdump
+#    into the directory 'expected4' as .dmp
+# 3. Modify the file tst_ncgen4_shared.sh to add
+#    the test to the end of the TESTS4 variable
+# 4. Add the new files into cdl4/Makfile.am
+#    and expected4/Makefile.am 
+
 set -e
 RESULTSDIR="./results"
 #SHOWXFAILS=1