diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 18:20:16 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 18:20:16 (GMT) |
commit | 53d5ccb17e75f4ce182f3d98f2b60891de07e716 (patch) | |
tree | 9d4bc41c0da2bc5b0e876cbb1c139f7a4743b290 | |
parent | bb8251f926850758dadb6251855d051d03f3f883 (diff) | |
download | hdf5-53d5ccb17e75f4ce182f3d98f2b60891de07e716.zip hdf5-53d5ccb17e75f4ce182f3d98f2b60891de07e716.tar.gz hdf5-53d5ccb17e75f4ce182f3d98f2b60891de07e716.tar.bz2 |
[svn-r18633] Description:
Bring r18632 from trunk to 1.8 branch:
Clean up memory leak in test code.
Tested on:
Linux/64 2.4 (amani) w/debug & valgrind
-rw-r--r-- | config/pgi-flags | 16 | ||||
-rw-r--r-- | test/fheap.c | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/config/pgi-flags b/config/pgi-flags index 2b03f3d..287ccce 100644 --- a/config/pgi-flags +++ b/config/pgi-flags @@ -68,15 +68,17 @@ if test "X-pgcc" = "X-$cc_vendor"; then #esac # General - H5_CFLAGS="$H5_CFLAGS $arch -Minform,warn" + H5_CFLAGS="$H5_CFLAGS $arch -Xa -c99 -Minform=inform" # Production - # Check for MPI wrapper being used and tweak down compiler options - if test "X-" == "X-$is_mpi"; then - PROD_CFLAGS="-fast -s -Mnoframe" - else - PROD_CFLAGS="-O2 -s" - fi + case "$cc_vendor-$cc_version" in + pgcc-10.*) + PROD_CFLAGS="-fast -s" + ;; + *) + PROD_CFLAGS="-O1 -s" + ;; + esac PROD_CPPFLAGS= # Debug diff --git a/test/fheap.c b/test/fheap.c index 4b1bd05..ade1ed4 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -15523,6 +15523,9 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) if(H5Fclose(file) < 0) FAIL_STACK_ERROR + /* Free resources */ + if(tparam->comp == FHEAP_TEST_COMPRESS) + H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */ /* Free resources */ H5MM_xfree(keep_ids.ids); |