diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2015-10-09 20:05:25 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2015-10-09 20:05:25 (GMT) |
| commit | 62f73dfa865207f7b0336b08578cb273be3ce691 (patch) | |
| tree | 104963d624448b0036fac38bcbbaae9bcd2c495a /test | |
| parent | 129c8840ae740afeab1013727614a76990c828ff (diff) | |
| download | hdf5-62f73dfa865207f7b0336b08578cb273be3ce691.zip hdf5-62f73dfa865207f7b0336b08578cb273be3ce691.tar.gz hdf5-62f73dfa865207f7b0336b08578cb273be3ce691.tar.bz2 | |
[svn-r28016] Undo r28009 changes.
Tested: jam.
Diffstat (limited to 'test')
| -rw-r--r-- | test/tcheck_version.c | 12 | ||||
| -rw-r--r-- | test/testcheck_version.sh.in | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/test/tcheck_version.c b/test/tcheck_version.c index 67c45fd..a75d642 100644 --- a/test/tcheck_version.c +++ b/test/tcheck_version.c @@ -39,9 +39,9 @@ void parse(int ac, char **av); void abort_intercept (int H5_ATTR_UNUSED sig); /* global variables */ -unsigned major = LT_VERS_INTERFACE; -unsigned minor = LT_VERS_REVISION; -unsigned release = LT_VERS_AGE; +unsigned major = H5_VERS_MAJOR; +unsigned minor = H5_VERS_MINOR; +unsigned release = H5_VERS_RELEASE; void showhelp(void) @@ -50,9 +50,9 @@ showhelp(void) printf("\t-h\tShow this page and version information\n"); printf("\t-t<vers>: Test by changing (adding 1 to) the <vers> to trigger\n"); printf("\t\t the warning. <vers> can be:\n"); - printf("\t\t\tM for Major version number (%d)\n", LT_VERS_INTERFACE); - printf("\t\t\tm for Minor version number (%d)\n", LT_VERS_REVISION); - printf("\t\t\tr for Release number (%d)\n", LT_VERS_AGE); + printf("\t\t\tM for Major version number (%d)\n", H5_VERS_MAJOR); + printf("\t\t\tm for Minor version number (%d)\n", H5_VERS_MINOR); + printf("\t\t\tr for Release number (%d)\n", H5_VERS_RELEASE); } diff --git a/test/testcheck_version.sh.in b/test/testcheck_version.sh.in index f89480e..ed9845e 100644 --- a/test/testcheck_version.sh.in +++ b/test/testcheck_version.sh.in @@ -217,11 +217,10 @@ h5libsettings=../src/libhdf5.settings PURPOSE -# Figure out lt version numbers from the header file. -# sed uses spaces and tabs as white spaces. -h5versmajor=`sed -e 's/#define[ ]*LT_VERS_INTERFACE[ ]*//p;d' $srcdir/../src/H5public.h` -h5versminor=`sed -e 's/#define[ ]*LT_VERS_REVISION[ ]*//p;d' $srcdir/../src/H5public.h` -h5versrelease=`sed -e 's/#define[ ]*LT_VERS_AGE[ ]*//p;d' $srcdir/../src/H5public.h` +# Figure out library version numbers from the header file. +h5versmajor=`grep '#define H5_VERS_MAJOR' $srcdir/../src/H5public.h | cut -f2` +h5versminor=`grep '#define H5_VERS_MINOR' $srcdir/../src/H5public.h | cut -f2` +h5versrelease=`grep '#define H5_VERS_RELEASE' $srcdir/../src/H5public.h | cut -f2` DEBUGPRINT $h5versmajor.$h5versminor.$h5versrelease case "$h5versmajor$h5versminor$h5versrelease" in [0-9]*) # good. noop. @@ -248,7 +247,7 @@ fi # HDF5_DISABLE_VERSION_CHECK, as unset, "", -1, 0, 1, 2, 3 for val_disable_version_check in unset "" -1 0 1 2 3; do - for wrong_version in none M r ; do + for wrong_version in none M m r; do TESTING "$val_disable_version_check" "$wrong_version" done done |