mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r29534] Normalization w/ revise_chunks in preparation for big merge.

Browse Source 
tools directory

Also fixes a minor Java test output error.

Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
           autotools serial w/ Java, Fortran, & C++
This commit is contained in:
Dana Robinson 2016-03-23 12:42:06 -05:00
parent 710d1caf54
commit 5a9a9e8f0e
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/cmake/jrunTest.cmake
View File

@ -72,9 +72,9 @@ endif (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
if (TEST_MASK_ERROR)
if (NOT TEST_ERRREF)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
else (NOT TEST_ERRREF)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
else (NOT TEST_ERRREF)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
endif (NOT TEST_ERRREF)
string (REGEX REPLACE "Time:[^\n]+\n" "Time: XXXX\n" TEST_STREAM "${TEST_STREAM}")
string (REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}")
@ -85,9 +85,9 @@ if (TEST_MASK_ERROR)
string (REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
string (REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}")
if (NOT TEST_ERRREF)
file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
else (NOT TEST_ERRREF)
file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
else (NOT TEST_ERRREF)
file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT}.err "${TEST_STREAM}")
endif (NOT TEST_ERRREF)
endif (TEST_MASK_ERROR)

2
tools/Makefile.am
View File

@ -25,6 +25,6 @@ CONFIG=ordered
# All subdirectories
SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
perform
perform
include $(top_srcdir)/config/conclude.am

2
tools/h5copy/h5copygentest.c
View File

@ -644,7 +644,7 @@ out:
*------------------------------------------------------------------------*/
static void Test_Obj_Copy(void)
{
hid_t fid=0;
hid_t fid = -1; /* File id */
/* Create source file */
fid = H5Fcreate(HDF_FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);

2
tools/h5repack/h5repack_main.c
View File

@ -360,7 +360,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options) {
has_i_o = 1;
break;
/* -o for backward compability */
/* -o for backward compability */
case 'o':
outfile = opt_arg;
has_i_o = 1;

8
tools/h5stat/h5stat_gentest.c
View File

@ -43,7 +43,6 @@
/*
* Generate HDF5 file with latest format with
* NUM_GRPS groups and NUM_ATTRS attributes for the dataset
*
*/
static void
gen_newgrat_file(const char *fname)
@ -111,6 +110,10 @@ gen_newgrat_file(const char *fname)
} /* end for */
/* Close dataset, dataspace, datatype, file */
if(H5Pclose(fapl) < 0)
goto error;
if(H5Pclose(fcpl) < 0)
goto error;
if(H5Dclose(did) < 0)
goto error;
if(H5Sclose(sid) < 0)
@ -122,6 +125,8 @@ gen_newgrat_file(const char *fname)
error:
H5E_BEGIN_TRY {
H5Pclose(fapl);
H5Pclose(fcpl);
H5Aclose(attr_id);
H5Dclose(did);
H5Tclose(tid);
@ -129,7 +134,6 @@ error:
H5Gclose(gid);
H5Fclose(fid);
} H5E_END_TRY;
} /* gen_newgrat_file() */
/*

2
tools/lib/h5tools.h
View File

@ -510,7 +510,7 @@ typedef struct h5tools_context_t {
hsize_t size_last_dim; /*the size of the last dimension,
*needed so we can break after each
*row */
int indent_level; /*the number of times we need some
int indent_level; /*the number of times we need some
*extra indentation */
int default_indent_level; /*this is used when the indent level gets changed */
hsize_t acc[H5S_MAX_RANK]; /* accumulator position */

3
tools/lib/h5tools_str.c
View File

@ -267,6 +267,9 @@ h5tools_str_fmt(h5tools_str_t *str/*in,out*/, size_t start, const char *fmt)
{
char _temp[1024], *temp = _temp;
HDassert(str);
HDassert(fmt);
/* If the format string is simply "%s" then don't bother doing anything */
if (!HDstrcmp(fmt, "%s"))
return str->s;