Skip to content

Commit d642e98

Browse files
kyang2014kyang2014
authored
Hyrax 2078 (#1291)
* HYRAX-2078, update the nasa cfdmr baseline files to reflect the update of dmrversion for BES tests. Also update the eos5 version. * HYRAX-2078, update the NASA HDF5 handler testsuite since the dmrVersion is changed to removed on the baseline files. Need to introduce a new macro remove_dmr_versions since the remove_versions macro change the contents of some NASA dmr files. * HYRAX-2078, update the .at file for the HDF4 handler NASA testsuite. Add the remove_dmr_version macro.
1 parent 6a46439 commit d642e98

14 files changed

Lines changed: 41 additions & 14 deletions

‎modules/common/handler_tests_macros.m4‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,14 @@ m4_define([REMOVE_VERSIONS], [dnl
771771
mv $1.awk $1
772772
])
773773

774+
m4_define([REMOVE_DMR_VERSIONS], [dnl
775+
awk '{
776+
gsub(/dmrVersion="[[0-9]+]\.[[0-9]+]"/, "dmrVersion=\"removed\"");
777+
print
778+
}' < $1 > $1.awk
779+
mv $1.awk $1
780+
])
781+
774782

775783
dnl Given a filename, remove the <Value> element of a DAP4 data response as
776784
dnl printed by getdap4 so that we dont have issues with comparing data values

‎modules/hdf4_handler/bes-testsuite/hdf4_handlerTest.nasa.dmr.with_hdfeos2.at‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ AT_INIT([bes.with_hdfeos2.conf besstandalone getdap])
88
# AT_COPYRIGHT([])
99

1010
AT_TESTED([besstandalone])
11+
m4_include([../../common/handler_tests_macros.m4])
1112

1213
# Usage: _AT_TEST_*(<bescmd source>, <baseline file>)
1314

@@ -19,6 +20,7 @@ AT_KEYWORDS([bescmd])
1920

2021
# This is the original.
2122
AT_CHECK([besstandalone -c $abs_builddir/bes.with_hdfeos2.conf -i $1 || true], [], [stdout], [stderr])
23+
REMOVE_DMR_VERSIONS([stdout])
2224
AT_CHECK([diff -b -B $2 stdout || diff -b -B $2 stderr], [], [ignore],[],[])
2325
AT_CLEANUP])
2426

@@ -40,7 +42,9 @@ AT_KEYWORDS([bescmd])
4042
# Use the following AT_CHECK to generate baseline file.
4143
#AT_CHECK([besstandalone -c $abs_builddir/bes.with_hdfeos2.conf -i $1 | getdap4 -D -M - > $2|| true], [], [stdout], [stderr])
4244

45+
#AT_CHECK([besstandalone -c $abs_builddir/bes.with_hdfeos2.conf -i $1 | getdap4 -C -D -M - || true], [], [stdout], [stderr])
4346
AT_CHECK([besstandalone -c $abs_builddir/bes.with_hdfeos2.conf -i $1 | getdap4 -D -M - || true], [], [stdout], [stderr])
47+
REMOVE_DMR_VERSIONS([stdout])
4448
AT_CHECK([diff -b -B $2 stdout || diff -b -B $2 stderr], [], [ignore],[],[])
4549
AT_CLEANUP])
4650

‎modules/hdf5_handler/bes-testsuite/h5.cf/swath_unlim.h5.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<Attribute name="HDFEOS_SWATHS_Swath1_Geolocation_Fields" type="Container"/>
7575
<Attribute name="HDFEOS_INFORMATION" type="Container">
7676
<Attribute name="HDFEOSVersion" type="String">
77-
<Value>HDFEOS_5.1.13</Value>
77+
<Value>HDFEOS_5.1.15</Value>
7878
</Attribute>
7979
<Attribute name="fullnamepath" type="String">
8080
<Value>/HDFEOS INFORMATION</Value>

‎modules/hdf5_handler/bes-testsuite/h5.nasa.default.dap4/eos5_sin_multi_grids.h5.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2449,7 +2449,7 @@
24492449
</Attribute>
24502450
</String>
24512451
<Attribute name="HDFEOSVersion" type="String">
2452-
<Value>HDFEOS_5.1.13</Value>
2452+
<Value>HDFEOS_5.1.15</Value>
24532453
</Attribute>
24542454
</Group>
24552455
</Dataset>

‎modules/hdf5_handler/bes-testsuite/h5.nasa.default.dap4/eos5lamaz.h5.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
</Attribute>
248248
</String>
249249
<Attribute name="HDFEOSVersion" type="String">
250-
<Value>HDFEOS_5.1.13</Value>
250+
<Value>HDFEOS_5.1.15</Value>
251251
</Attribute>
252252
</Group>
253253
</Dataset>

‎modules/hdf5_handler/bes-testsuite/h5.nasa.default.dap4/eos5ps.h5.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@
945945
</Attribute>
946946
</String>
947947
<Attribute name="HDFEOSVersion" type="String">
948-
<Value>HDFEOS_5.1.13</Value>
948+
<Value>HDFEOS_5.1.15</Value>
949949
</Attribute>
950950
</Group>
951951
</Dataset>

‎modules/hdf5_handler/bes-testsuite/h5.nasa.dmr/airsm_utm.h5.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3625,7 +3625,7 @@ Last Changed Date: 2017-04-20 12:48:45 -0700 (Thu, 20 Apr 2017)
36253625
<Attribute name="HDFEOS_GRIDS_Ancillary_Data_Fields" type="Container"/>
36263626
<Attribute name="HDFEOS_INFORMATION" type="Container">
36273627
<Attribute name="HDFEOSVersion" type="String">
3628-
<Value>HDFEOS_5.1.13</Value>
3628+
<Value>HDFEOS_5.1.15</Value>
36293629
</Attribute>
36303630
<Attribute name="fullnamepath" type="String">
36313631
<Value>/HDFEOS INFORMATION</Value>

‎modules/hdf5_handler/bes-testsuite/h5.nasa.dmr/eos5_sin_multi_grids.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2666,7 +2666,7 @@
26662666
<Attribute name="HDFEOS_GRIDS_VNP_Grid_500m_2D_Data_Fields" type="Container"/>
26672667
<Attribute name="HDFEOS_INFORMATION" type="Container">
26682668
<Attribute name="HDFEOSVersion" type="String">
2669-
<Value>HDFEOS_5.1.13</Value>
2669+
<Value>HDFEOS_5.1.15</Value>
26702670
</Attribute>
26712671
<Attribute name="fullnamepath" type="String">
26722672
<Value>/HDFEOS INFORMATION</Value>

‎modules/hdf5_handler/bes-testsuite/h5.nasa.dmr/eos5lamaz.h5.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ END
444444
<Attribute name="HDFEOS_GRIDS_Southern_Hemisphere_Data_Fields" type="Container"/>
445445
<Attribute name="HDFEOS_INFORMATION" type="Container">
446446
<Attribute name="HDFEOSVersion" type="String">
447-
<Value>HDFEOS_5.1.13</Value>
447+
<Value>HDFEOS_5.1.15</Value>
448448
</Attribute>
449449
<Attribute name="fullnamepath" type="String">
450450
<Value>/HDFEOS INFORMATION</Value>

‎modules/hdf5_handler/bes-testsuite/h5.nasa.dmr/eos5ps.h5.dmr.bescmd.baseline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ END
14121412
<Attribute name="HDFEOS_GRIDS_SpPolarGrid12km_Data_Fields" type="Container"/>
14131413
<Attribute name="HDFEOS_INFORMATION" type="Container">
14141414
<Attribute name="HDFEOSVersion" type="String">
1415-
<Value>HDFEOS_5.1.13</Value>
1415+
<Value>HDFEOS_5.1.15</Value>
14161416
</Attribute>
14171417
<Attribute name="fullnamepath" type="String">
14181418
<Value>/HDFEOS INFORMATION</Value>

0 commit comments

Comments
 (0)