Changeset 1796


Ignore:
Timestamp:
14/12/11 22:17:30 (5 months ago)
Author:
Peter Peterson
Message:

Modifying prints so it can be more easily parsed. Refs #317.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/testsuite.at

    r1784 r1796  
    2727AT_BANNER([[Testing the NeXus C library.]]) 
    2828 
    29 AT_SETUP([Check the HDF4 binding]) 
     29AT_SETUP([Check the C binding using HDF4]) 
    3030AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test-hdf4 | sed -e 's/\r$//' ], [],  
    3131[[NXinquirefile found: NXtest.hdf 
    … …  
    8484AT_CLEANUP 
    8585 
    86 AT_SETUP([Check the HDF5 binding]) 
     86AT_SETUP([Check the C binding using HDF5]) 
    8787AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test-hdf5 | sed -e 's/\r$//' ], [],  
    8888[[NXinquirefile found: NXtest.h5 
    … …  
    143143AT_CLEANUP 
    144144 
    145 AT_SETUP([Check the HDF4 binding (static library)]) 
     145AT_SETUP([Check the C binding using HDF4 (static library)]) 
    146146AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test-hdf4-static | sed -e 's/\r$//' ], [],  
    147147[[NXinquirefile found: NXtest.hdf 
    … …  
    200200AT_CLEANUP 
    201201 
    202 AT_SETUP([Check the HDF5 binding (static library)]) 
     202AT_SETUP([Check the C binding using HDF5 (static library)]) 
    203203AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test-hdf5-static | sed -e 's/\r$//' ], [],  
    204204[[NXinquirefile found: NXtest.h5 
    … …  
    259259AT_CLEANUP 
    260260 
    261 AT_SETUP([Check the XML binding]) 
     261AT_SETUP([Check the C binding using XML]) 
    262262AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml | sed -e 's/\r$//' ], [],  
    263263[[NXinquirefile found: NXtest.xml 
    … …  
    321321AT_CLEANUP 
    322322 
    323 AT_SETUP([Check the XML binding (static library)]) 
     323AT_SETUP([Check the C binding using XML (static library)]) 
    324324AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml-static | sed -e 's/\r$//' ], [],  
    325325[[NXinquirefile found: NXtest.xml 
    … …  
    383383AT_CLEANUP 
    384384 
    385 AT_SETUP([Check the XML table binding (static library)]) 
     385AT_SETUP([Check the C binding using XML table (static library)]) 
    386386AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml-table-static | sed -e 's/\r$//' ], [],  
    387387[[NXinquirefile found: NXtest-table.xml 
    … …  
    569569 
    570570AT_BANNER([Check the C++ binding.]) 
    571 AT_SETUP([Check the C++ binding with HDF4.]) 
     571AT_SETUP([Check the C++ binding using HDF4.]) 
    572572AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test_cpp-hdf4 | sed -e 's/\r$//' ], [],  
    573573[[NXinquirefile found: napi_test_cpp.hdf 
    … …  
    606606]]) 
    607607AT_CLEANUP 
    608 AT_SETUP([Check the C++ binding with HDF5.]) 
     608AT_SETUP([Check the C++ binding using HDF5.]) 
    609609AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test_cpp-hdf5 | sed -e 's/\r$//' ], [],  
    610610[[NXinquirefile found: napi_test_cpp.h5 
    … …  
    645645]]) 
    646646AT_CLEANUP 
    647 AT_SETUP([Check the C++ binding with xml.]) 
     647AT_SETUP([Check the C++ binding using xml.]) 
    648648AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test_cpp-xml | sed -e 's/\r$//' ], [],  
    649649[[NXinquirefile found: napi_test_cpp.xml 
    … …  
    689689 
    690690AT_BANNER([[Testing the Python bindings.]]) 
    691 AT_SETUP([Checking HDF4 test file]) 
     691AT_SETUP([Checking python binding using HDF4]) 
    692692AT_CHECK([skip_test && $HAVE_HDF4 && $HAVE_PYTHON && $PYTHON $abs_srcdir/../bindings/python/nxstest.py -q hdf4 | sed -e 's/\r$//' ],[],  
    693693[[]]) 
    694694AT_CLEANUP 
    695 AT_SETUP([Checking HDF5 test file]) 
     695AT_SETUP([Checking python binding using HDF5]) 
    696696AT_CHECK([$HAVE_HDF5 && $HAVE_PYTHON && $PYTHON $abs_srcdir/../bindings/python/nxstest.py -q hdf5 | sed -e 's/\r$//' ],[],  
    697697[[]]) 
    698698AT_CLEANUP 
    699 AT_SETUP([Checking XML test file]) 
     699AT_SETUP([Checking python binding using XML]) 
    700700AT_CHECK([$HAVE_XML && $HAVE_PYTHON && $PYTHON $abs_srcdir/../bindings/python/nxstest.py -q xml | sed -e 's/\r$//' ],[],  
    701701[[]]) 
    … …  
    703703 
    704704AT_BANNER([[Testing the IDL bindings.]]) 
    705 AT_SETUP([Checking HDF4 test file]) 
     705AT_SETUP([Checking IDL binding using HDF4]) 
    706706AT_CHECK([skip_test && $HAVE_HDF4 && $HAVE_IDL && $SETUP_TEST && $SHELL $abs_srcdir/../bindings/idl/testidlnapi "'hdf4'" | sed -e 's/\r$//' ],[],  
    707707[['hdf4' 
    … …  
    11201120]]) 
    11211121AT_CLEANUP 
    1122 AT_SETUP([Checking HDF5 test file]) 
     1122AT_SETUP([Checking IDL binding using HDF5]) 
    11231123AT_CHECK([$HAVE_HDF5 && $HAVE_IDL && $SETUP_TEST && $SHELL $abs_srcdir/../bindings/idl/testidlnapi "'hdf5'" | sed -e 's/\r$//' ],[],  
    11241124[['hdf5' 
    … …  
    15371537]]) 
    15381538AT_CLEANUP 
    1539 AT_SETUP([Checking XML test file]) 
     1539AT_SETUP([Checking IDL binding using XML]) 
    15401540AT_CHECK([$HAVE_XML && $HAVE_IDL && $SETUP_TEST && $SHELL $abs_srcdir/../bindings/idl/testidlnapi "'xml'" | sed -e 's/\r$//' ],[],  
    15411541[['xml' 
    … …  
    19711971 
    19721972AT_BANNER([[Testing the NeXus File Converter.]]) 
    1973 AT_SETUP([Checking HDF4 -> HDF4 ]) 
     1973AT_SETUP([Checking nxconvert HDF4 -> HDF4 ]) 
    19741974AT_CHECK([$HAVE_HDF4 && nxconvert --hdf 4 NXtest.hdf a.a | sed -e 's/\r$//' ],[],  
    19751975[[Converting NXtest.hdf to HDF4 NeXus file a.a 
    … …  
    19771977]]) 
    19781978AT_CLEANUP 
    1979 AT_SETUP([Checking HDF4 -> HDF5 ]) 
     1979AT_SETUP([Checking nxconvert HDF4 -> HDF5 ]) 
    19801980AT_CHECK([$HAVE_HDF4 && $HAVE_HDF5 && nxconvert --hdf 5 NXtest.hdf a.a | sed -e 's/\r$//' ],[],  
    19811981[[Converting NXtest.hdf to HDF5 NeXus file a.a 
    … …  
    19831983]]) 
    19841984AT_CLEANUP 
    1985 AT_SETUP([Checking HDF4 -> XML ]) 
     1985AT_SETUP([Checking nxconvert HDF4 -> XML ]) 
    19861986AT_CHECK([$HAVE_HDF4 && $HAVE_XML && nxconvert -x NXtest.hdf a.a | sed -e 's/\r$//' ],[],  
    19871987[[Converting NXtest.hdf to XML NeXus file a.a 
    … …  
    19891989]]) 
    19901990AT_CLEANUP 
    1991 #AT_SETUP([Checking HDF5 -> HDF4 ]) 
     1991#AT_SETUP([Checking nxconvert HDF5 -> HDF4 ]) 
    19921992#AT_CHECK([$HAVE_HDF5 && $HAVE_HDF4 && nxconvert --hdf 4 NXtest.h5 a.a | sed -e 's/\r$//' ],[],  
    19931993#[[Converting NXtest.h5 to HDF4 NeXus file a.a 
    … …  
    19951995#]]) 
    19961996#AT_CLEANUP 
    1997 AT_SETUP([Checking HDF5 -> HDF5 ]) 
     1997AT_SETUP([Checking nxconvert HDF5 -> HDF5 ]) 
    19981998AT_CHECK([$HAVE_HDF5 && nxconvert --hdf 5 NXtest.h5 a.a | sed -e 's/\r$//' ],[],  
    19991999[[Converting NXtest.h5 to HDF5 NeXus file a.a 
    … …  
    20012001]]) 
    20022002AT_CLEANUP 
    2003 AT_SETUP([Checking HDF5 -> XML ]) 
     2003AT_SETUP([Checking nxconvert HDF5 -> XML ]) 
    20042004AT_CHECK([$HAVE_HDF5 && $HAVE_XML && nxconvert -x NXtest.h5 a.a | sed -e 's/\r$//' ],[],  
    20052005[[Converting NXtest.h5 to XML NeXus file a.a 
    … …  
    20072007]]) 
    20082008AT_CLEANUP 
    2009 #AT_SETUP([Checking XML -> HDF4 ]) 
     2009#AT_SETUP([Checking nxconvert XML -> HDF4 ]) 
    20102010#AT_CHECK([$HAVE_XML && $HAVE_HDF4 && nxconvert --hdf 4 NXtest.xml a.a | sed -e 's/\r$//' ],[],  
    20112011#[[Converting NXtest.xml to HDF4 NeXus file a.a 
    … …  
    20132013#]]) 
    20142014#AT_CLEANUP 
    2015 AT_SETUP([Checking XML -> HDF5 ]) 
     2015AT_SETUP([Checking nxconvert XML -> HDF5 ]) 
    20162016AT_CHECK([$HAVE_XML && $HAVE_HDF5 && nxconvert --hdf 5 NXtest.xml a.a | sed -e 's/\r$//' ],[],  
    20172017[[Converting NXtest.xml to HDF5 NeXus file a.a 
    … …  
    20192019]]) 
    20202020AT_CLEANUP 
    2021 AT_SETUP([Checking XML -> XML ]) 
     2021AT_SETUP([Checking nxconvert XML -> XML ]) 
    20222022AT_CHECK([$HAVE_XML && nxconvert -x NXtest.xml a.a | sed -e 's/\r$//' ],[],  
    20232023[[Converting NXtest.xml to XML NeXus file a.a 
    … …  
    20272027 
    20282028AT_BANNER([[Testing NXsummary Tool.]]) 
    2029 AT_SETUP([Checking HDF4 test file]) 
     2029AT_SETUP([Checking nxsummary HDF4 test file]) 
    20302030AT_CHECK([$HAVE_HDF4 && $HAVE_NXSUMMARY && nxsummary --config NONE NXtest.hdf | sed -e 's/\r$//' ],[],  
    20312031[[SAMPLE: 
    20322032]]) 
    20332033AT_CLEANUP 
    2034 AT_SETUP([Checking HDF5 test file]) 
     2034AT_SETUP([Checking nxsummary HDF5 test file]) 
    20352035AT_CHECK([$HAVE_HDF5 && $HAVE_NXSUMMARY && nxsummary --config NONE NXtest.h5 | sed -e 's/\r$//' ],[],  
    20362036[[SAMPLE: 
    20372037]]) 
    20382038AT_CLEANUP 
    2039 AT_SETUP([Checking XML test file]) 
     2039AT_SETUP([Checking nxsummary XML test file]) 
    20402040AT_CHECK([$HAVE_XML && $HAVE_NXSUMMARY && nxsummary --config NONE NXtest.xml | sed -e 's/\r$//' ],[],  
    20412041[[SAMPLE: 
    … …  
    20442044 
    20452045AT_BANNER([[Testing NXbrowse Tool.]]) 
    2046 AT_SETUP([Checking HDF4 test file]) 
     2046AT_SETUP([Checking nxbrowse HDF4 test file]) 
    20472047AT_CHECK([$HAVE_HDF4 && env NO_READLINE=1 nxbrowse NXtest.hdf  < ${abs_srcdir}/nxbrowse.txt | grep -v 'HDF_version = ' | grep -v 'file_time = ' | grep -v 'readline support' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[],  
    20482048[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format 
    … …  
    20562056]]) 
    20572057AT_CLEANUP 
    2058 AT_SETUP([Checking HDF5 test file]) 
     2058AT_SETUP([Checking nxbrowse HDF5 test file]) 
    20592059AT_CHECK([$HAVE_HDF5 && env NO_READLINE=1 nxbrowse NXtest.h5  < ${abs_srcdir}/nxbrowse.txt | grep -v 'HDF5_Version = ' | grep -v 'file_time = ' | grep -v 'readline support' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[],  
    20602060[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format 
    … …  
    20682068]]) 
    20692069AT_CLEANUP 
    2070 AT_SETUP([Checking XML test file]) 
     2070AT_SETUP([Checking nxbrowse XML test file]) 
    20712071AT_CHECK([$HAVE_XML && env NO_READLINE=1 nxbrowse NXtest.xml  < ${abs_srcdir}/nxbrowse.txt | grep -v 'file_time = ' | grep -v 'XML_version = ' | grep -v 'readline support' | sed -e 's/\r$//' | sed -e 's/[ ]*$//' ],[],  
    20722072[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format 
    … …  
    20852085 
    20862086AT_BANNER([[Testing NXdir Tool.]]) 
    2087 AT_SETUP([Checking HDF4 test file]) 
     2087AT_SETUP([Checking nxdir HDF4 test file]) 
    20882088AT_CHECK([$HAVE_HDF4 && nxdir NXtest.hdf | sed -e 's/\r$//' ],[],  
    20892089[[/entry/ 
    … …  
    20912091]]) 
    20922092AT_CLEANUP 
    2093 AT_SETUP([Checking HDF5 test file]) 
     2093AT_SETUP([Checking nxdir HDF5 test file]) 
    20942094AT_CHECK([$HAVE_HDF5 && nxdir NXtest.h5 | sed -e 's/\r$//' ],[],  
    20952095[[/entry/ 
    … …  
    20972097]]) 
    20982098AT_CLEANUP 
    2099 AT_SETUP([Checking XML test file]) 
     2099AT_SETUP([Checking nxdir XML test file]) 
    21002100AT_CHECK([$HAVE_XML && nxdir NXtest.xml | sed -e 's/\r$//' ],[],  
    21012101[[/entry/ 
Note: See TracChangeset for help on using the changeset viewer.