From 51a2595445abb9ee0d62e3f50b02711e105bb83f Mon Sep 17 00:00:00 2001 From: Alexander van Amesfoort <amesfoort@astron.nl> Date: Fri, 18 Aug 2017 17:15:08 +0000 Subject: [PATCH] Task #11013: (try to) fix just added TBB_Writer tests in r38180 wrt different HDF5 h5dump output formats. Sigh. --- .../OutputProc/test/tTBB_Writer-spectral.run | 15 +++++++++++++-- .../OutputProc/test/tTBB_Writer-transient.run | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.run b/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.run index c10351926aa..451cd6994db 100755 --- a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.run +++ b/RTCP/Cobalt/OutputProc/test/tTBB_Writer-spectral.run @@ -8,8 +8,19 @@ status=0 TBB_Writer --parset=tTBB_Writer-spectral.parset --staticmetadatadir=tTBB_Writer-spectral.in_1 --outputdir=. --input=file:tTBB_Writer-spectral.in_1/sb_20170711_094130_1310_sb99-100dupl.dat --timeout=1 --keeprunning=0 || status=1 # Check some .h5 attributes vs a reference output -h5dump -a TELESCOPE -a OPERATING_MODE -a STATION_CS013/STATION_NAME -a STATION_CS013/STATION_POSITION -a STATION_CS013/DIPOLE_013001010/DATA_LENGTH -a STATION_CS013/DIPOLE_013001010/TIME L121213_CS013_D20170711T094130.000Z_tbb.h5 > L121213_CS013_D20170711T094130.000Z_tbb.h5.selected-attribs.txt || status=1 -diff L121213_CS013_D20170711T094130.000Z_tbb.h5.selected-attribs.txt tTBB_Writer-spectral.in_1/L121213_CS013_D20170711T094130.000Z_tbb.h5.selected-attribs.txt || status=1 +# Older HDF5 1.8 versions (e.g. 1.8.4) print e.g.: 'ATTRIBUTE "STATION_CS011/STATION_NAME" {' instead of: 'ATTRIBUTE "STATION_NAME" {' and different spacing. +# Use sed magic to strip the HDF5 dirname and use diff with -b. (Better: use h5diff.) +h5dump -a TELESCOPE \ + -a OPERATING_MODE \ + -a STATION_CS013/STATION_NAME \ + -a STATION_CS013/STATION_POSITION \ + -a STATION_CS013/DIPOLE_013001010/DATA_LENGTH \ + -a STATION_CS013/DIPOLE_013001010/TIME \ + L121213_CS013_D20170711T094130.000Z_tbb.h5 | \ + sed -r -e 's/^ATTRIBUTE "([[:alnum:]_]+\/)*([[:alnum:]_]+)"/ATTRIBUTE "\2"/' > \ + L121213_CS013_D20170711T094130.000Z_tbb.h5.selected-attribs.txt || status=1 + +diff -b L121213_CS013_D20170711T094130.000Z_tbb.h5.selected-attribs.txt tTBB_Writer-spectral.in_1/L121213_CS013_D20170711T094130.000Z_tbb.h5.selected-attribs.txt || status=1 # Check .raw file vs a reference output (.raw outputs for both subbands are the same here, so check vs the same refout) diff L121213_CS013_RSP001_RCU010_SB099_D20170711T094130.000Z_tbb.raw tTBB_Writer-spectral.in_1/tTBB_Writer-spectral-refout.raw || status=1 diff --git a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.run b/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.run index d683dd086d3..db1d9f46f90 100755 --- a/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.run +++ b/RTCP/Cobalt/OutputProc/test/tTBB_Writer-transient.run @@ -8,8 +8,20 @@ status=0 TBB_Writer --parset=tTBB_Writer-transient.parset --staticmetadatadir=tTBB_Writer-transient.in_1 --outputdir=. --input=file:tTBB_Writer-transient.in_1/rw_20110719_110541_1110.dat --timeout=1 --keeprunning=0 || status=1 # Check some .h5 attributes vs a reference output -h5dump -a TELESCOPE -a OPERATING_MODE -a STATION_CS011/STATION_NAME -a STATION_CS011/STATION_POSITION -a STATION_CS011/DIPOLE_011001010/DATA_LENGTH -a STATION_CS011/DIPOLE_011001010/SAMPLE_NUMBER -a STATION_CS011/DIPOLE_011001010/TIME L121212_CS011_D20110719T110541.036Z_tbb.h5 > L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt || status=1 -diff L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt tTBB_Writer-transient.in_1/L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt || status=1 +# Older HDF5 1.8 versions (e.g. 1.8.4) print e.g.: 'ATTRIBUTE "STATION_CS011/STATION_NAME" {' instead of: 'ATTRIBUTE "STATION_NAME" {' and different spacing. +# Use sed magic to strip the HDF5 dirname and use diff with -b. (Better: use h5diff.) +h5dump -a TELESCOPE \ + -a OPERATING_MODE \ + -a STATION_CS011/STATION_NAME \ + -a STATION_CS011/STATION_POSITION \ + -a STATION_CS011/DIPOLE_011001010/DATA_LENGTH \ + -a STATION_CS011/DIPOLE_011001010/SAMPLE_NUMBER \ + -a STATION_CS011/DIPOLE_011001010/TIME \ + L121212_CS011_D20110719T110541.036Z_tbb.h5 | \ + sed -r -e 's/^ATTRIBUTE "([[:alnum:]_]+\/)*([[:alnum:]_]+)"/ATTRIBUTE "\2"/' > \ + L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt || status=1 + +diff -b L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt tTBB_Writer-transient.in_1/L121212_CS011_D20110719T110541.036Z_tbb.h5.selected-attribs.txt || status=1 # Check .raw file vs a reference output diff L121212_CS011_RSP001_RCU010_D20110719T110541.036Z_tbb.raw tTBB_Writer-transient.in_1/tTBB_Writer-transient-refout.raw || status=1 -- GitLab