Skip to content

Commit

Permalink
Update to 4.3.1 refs #306
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.nexusformat.org/code/branches/4.3@1874 ff5d1e40-2be0-497f-93bd-dc18237bd3c7
  • Loading branch information
FreddieAkeroyd authored and Freddie Akeroyd committed Mar 5, 2013
1 parent 75e8cc6 commit 79a3099
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ m4_define([SVNREV],m4_esyscmd([svn info | grep Revision | awk '{print $2}' | tr
m4_define([SVN_RELEASE],m4_join([],ISODATE,[svn],SVNREV)))dnl

## main version we are based on
m4_define([NEXUS_VERSION],[4.3.0])dnl
m4_define([NEXUS_VERSION],[4.3.1])dnl

## things like rc1 or 20100903svn1734
#m4_define([NEXUS_RELEASE],SVN_RELEASE)dnl
Expand Down
2 changes: 1 addition & 1 deletion include/napi.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#endif /* HAVE_CONFIG_H */

/* NeXus HDF45 */
#define NEXUS_VERSION "4.3.0" /* major.minor.patch */
#define NEXUS_VERSION "4.3.1" /* major.minor.patch */

#define CONSTCHAR const char

Expand Down
44 changes: 22 additions & 22 deletions test/testsuite.at
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ AT_SETUP([Check the C binding using HDF4])
AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test-hdf4 | sed -e 's/\r$//' ], [],
[[NXinquirefile found: NXtest.hdf
Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.hdf
Number of group attributes: 2
NXentry path /entry
Expand Down Expand Up @@ -87,7 +87,7 @@ AT_SETUP([Check the C binding using HDF5])
AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test-hdf5 | sed -e 's/\r$//' ], [],
[[NXinquirefile found: NXtest.h5
Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.h5
Number of group attributes: 2
NXentry path /entry
Expand Down Expand Up @@ -146,7 +146,7 @@ AT_SETUP([Check the C binding using HDF4 (static library)])
AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test-hdf4-static | sed -e 's/\r$//' ], [],
[[NXinquirefile found: NXtest.hdf
Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.hdf
Number of group attributes: 2
NXentry path /entry
Expand Down Expand Up @@ -203,7 +203,7 @@ AT_SETUP([Check the C binding using HDF5 (static library)])
AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test-hdf5-static | sed -e 's/\r$//' ], [],
[[NXinquirefile found: NXtest.h5
Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.h5
Number of group attributes: 2
NXentry path /entry
Expand Down Expand Up @@ -262,7 +262,7 @@ AT_SETUP([Check the C binding using XML])
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml | sed -e 's/\r$//' ], [],
[[NXinquirefile found: NXtest.xml
Number of global attributes: 7
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.xml
xmlns = http://definition.nexusformat.org/schema/3.1
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
Expand Down Expand Up @@ -324,7 +324,7 @@ AT_SETUP([Check the C binding using XML (static library)])
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml-static | sed -e 's/\r$//' ], [],
[[NXinquirefile found: NXtest.xml
Number of global attributes: 7
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.xml
xmlns = http://definition.nexusformat.org/schema/3.1
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
Expand Down Expand Up @@ -386,7 +386,7 @@ AT_SETUP([Check the C binding using XML table (static library)])
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test-xml-table-static | sed -e 's/\r$//' ], [],
[[NXinquirefile found: NXtest-table.xml
Number of global attributes: 7
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest-table.xml
xmlns = http://definition.nexusformat.org/schema/3.1
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
Expand Down Expand Up @@ -449,7 +449,7 @@ AT_BANNER([Check the FORTRAN binding.])
AT_SETUP([Check the F77 binding using HDF4.])
AT_CHECK([ $HAVE_F77 && $HAVE_HDF4 && $SETUP_TEST && napif_test-hdf4 | sed -e 's/\r$//' ], [],
[[ Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.nxs
Group: entry(NXentry) contains 8 items
Path = /entry/ch_data
Expand Down Expand Up @@ -491,7 +491,7 @@ AT_CLEANUP
AT_SETUP([Check the F77 binding using HDF5.])
AT_CHECK([ $HAVE_F77 && $HAVE_HDF5 && $SETUP_TEST && napif_test-hdf5 | sed -e 's/\r$//' ], [],
[[ Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.nxs
Group: entry(NXentry) contains 8 items
Path = /entry/ch_data
Expand Down Expand Up @@ -534,7 +534,7 @@ AT_SETUP([Check the F90 binding using HDF5.])
AT_CHECK([ $HAVE_F90 && $HAVE_HDF5 && $SETUP_TEST && NXtest | sed -e 's/\r$//' ], [],
[[Writing character data
Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = NXtest.nxs
Group: entry(NXentry) contains 8 items
ch_data : NX_CHAR
Expand Down Expand Up @@ -572,7 +572,7 @@ AT_SETUP([Check the C++ binding using HDF4.])
AT_CHECK([ $HAVE_HDF4 && $SETUP_TEST && napi_test_cpp-hdf4 | sed -e 's/\r$//' ], [],
[[NXinquirefile found: napi_test_cpp.hdf
Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = napi_test_cpp.hdf
Number of group attributes: 2
hugo = namenlos
Expand Down Expand Up @@ -609,7 +609,7 @@ AT_SETUP([Check the C++ binding using HDF5.])
AT_CHECK([ $HAVE_HDF5 && $SETUP_TEST && napi_test_cpp-hdf5 | sed -e 's/\r$//' ], [],
[[NXinquirefile found: napi_test_cpp.h5
Number of global attributes: 4
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = napi_test_cpp.h5
Number of group attributes: 2
hugo = namenlos
Expand Down Expand Up @@ -648,7 +648,7 @@ AT_SETUP([Check the C++ binding using xml.])
AT_CHECK([ $HAVE_XML && $SETUP_TEST && napi_test_cpp-xml | sed -e 's/\r$//' ], [],
[[NXinquirefile found: napi_test_cpp.xml
Number of global attributes: 7
NeXus_version = 4.3.0
NeXus_version = 4.3.1
file_name = napi_test_cpp.xml
xmlns = http://definition.nexusformat.org/schema/3.1
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
Expand Down Expand Up @@ -832,7 +832,7 @@ Number of global attributes: 4
NXgetnextattr status: 1

attribute name: NeXus_version
attribute value: 4.3.0
attribute value: 4.3.1

NXgetnextattr status: 1

Expand Down Expand Up @@ -1249,7 +1249,7 @@ Number of global attributes: 4
NXgetnextattr status: 1

attribute name: NeXus_version
attribute value: 4.3.0
attribute value: 4.3.1

NXgetnextattr status: 1

Expand Down Expand Up @@ -1666,7 +1666,7 @@ Number of global attributes: 7
NXgetnextattr status: 1

attribute name: NeXus_version
attribute value: 4.3.0
attribute value: 4.3.1

NXgetnextattr status: 1

Expand Down Expand Up @@ -2045,8 +2045,8 @@ AT_CLEANUP
AT_BANNER([[Testing NXbrowse Tool.]])
AT_SETUP([Checking nxbrowse HDF4 test file])
AT_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/[ ]*$//' ],[],
[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format
NeXus_version = 4.3.0
[[NXBrowse 4.3.1 Copyright (C) 2009 NeXus Data Format
NeXus_version = 4.3.1
file_name = NXtest.hdf
NX> NX Group : entry (NXentry)
entry attribute: hugo = namenlos
Expand All @@ -2057,8 +2057,8 @@ NX>
AT_CLEANUP
AT_SETUP([Checking nxbrowse HDF5 test file])
AT_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/[ ]*$//' ],[],
[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format
NeXus_version = 4.3.0
[[NXBrowse 4.3.1 Copyright (C) 2009 NeXus Data Format
NeXus_version = 4.3.1
file_name = NXtest.h5
NX> NX Group : entry (NXentry)
entry attribute: hugo = namenlos
Expand All @@ -2069,8 +2069,8 @@ NX>
AT_CLEANUP
AT_SETUP([Checking nxbrowse XML test file])
AT_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/[ ]*$//' ],[],
[[NXBrowse 4.3.0 Copyright (C) 2009 NeXus Data Format
NeXus_version = 4.3.0
[[NXBrowse 4.3.1 Copyright (C) 2009 NeXus Data Format
NeXus_version = 4.3.1
file_name = NXtest.xml
xmlns = http://definition.nexusformat.org/schema/3.1
xmlns:xsi = http://www.w3.org/2001/XMLSchema-instance
Expand Down

0 comments on commit 79a3099

Please sign in to comment.