diff options
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/tools/gif2h5/gif2hdf.c | 6 | ||||
| -rw-r--r-- | hl/tools/h5watch/CMakeTests.cmake | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c index 9220655..161761c 100644 --- a/hl/tools/gif2h5/gif2hdf.c +++ b/hl/tools/gif2h5/gif2hdf.c @@ -26,8 +26,8 @@ main(int argv, char *argc[]) FILE *fpGif; /* replacing int32 with long */ - long i, ImageCount; - long filesize; + long i, ImageCount; + HDoff_t filesize; GIFBYTE *MemGif; GIFBYTE *StartPos; @@ -71,7 +71,7 @@ main(int argv, char *argc[]) /* Get the whole file into memory. Mem's much faster than I/O */ fseek(fpGif, 0L, 2); - filesize = ftell(fpGif); + filesize = HDftell(fpGif); fseek(fpGif, 0L, 0); if (filesize == 0) diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake index aa4c41a..ce0e10e 100644 --- a/hl/tools/h5watch/CMakeTests.cmake +++ b/hl/tools/h5watch/CMakeTests.cmake @@ -105,8 +105,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes -D "TEST_OUTPUT=${resultfile}.out" -D "TEST_EXPECT=${resultcode}" -D "TEST_REFERENCE=${resultfile}.mty" - -D "TEST_ERRREF=${resultfile}.err" - -P "${HDF_RESOURCES_DIR}/runTest.cmake" + -D "TEST_ERRREF=h5watch error" + -D "TEST_SKIP_COMPARE=true" + -P "${HDF_RESOURCES_DIR}/grepTest.cmake" ) set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DEPENDS ${last_test} |