diff options
author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-12-02 06:17:15 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-12-02 06:17:15 (GMT) |
commit | 49f45640f6b1a3f162027f22a0f00b6eb7f3f433 (patch) | |
tree | efd0f1ec87de84e17969c0d079d1ffa32aab3a8c /test | |
parent | ce2748f0114cb1eae00799f8349a5451152c7fa3 (diff) | |
download | hdf5-49f45640f6b1a3f162027f22a0f00b6eb7f3f433.zip hdf5-49f45640f6b1a3f162027f22a0f00b6eb7f3f433.tar.gz hdf5-49f45640f6b1a3f162027f22a0f00b6eb7f3f433.tar.bz2 |
(1) Fix for accumulator issue #1 as described in John's previous checkin
(2) Test files for encoding/decoding property lists
(3) Fix test failures for PB statistics in test/page_buffer.c
(Will double check with John later about PB statistics collection)
Diffstat (limited to 'test')
-rw-r--r-- | test/page_buffer.c | 42 | ||||
-rw-r--r-- | test/testfiles/plist_files/def_fapl_32be | bin | 1711 -> 3801 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/def_fapl_32le | bin | 1711 -> 3801 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/def_fapl_64be | bin | 1711 -> 3801 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/def_fapl_64le | bin | 1711 -> 3801 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/fapl_32be | bin | 1713 -> 3803 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/fapl_32le | bin | 1713 -> 3803 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/fapl_64be | bin | 1713 -> 3803 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/fapl_64le | bin | 1713 -> 3803 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/lapl_32be | bin | 1816 -> 3906 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/lapl_32le | bin | 1816 -> 3906 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/lapl_64be | bin | 1816 -> 3906 bytes | |||
-rw-r--r-- | test/testfiles/plist_files/lapl_64le | bin | 1816 -> 3906 bytes |
13 files changed, 20 insertions, 22 deletions
diff --git a/test/page_buffer.c b/test/page_buffer.c index 58e6323..c537ad7 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -2053,22 +2053,22 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) sizeof(int)*100, data) < 0) FAIL_STACK_ERROR; - if ( ( f->shared->pb_ptr->accesses[0] != 10 ) || + if ( ( f->shared->pb_ptr->accesses[0] != 9 ) || ( f->shared->pb_ptr->accesses[1] != 16 ) || ( f->shared->pb_ptr->accesses[2] != 0 ) ) { - HDfprintf(stderr, "accesses[] = {%d, %d, %d}. {10, 16, 0} expected\n", + HDfprintf(stderr, "accesses[] = {%d, %d, %d}. {9, 16, 0} expected\n", f->shared->pb_ptr->accesses[0], f->shared->pb_ptr->accesses[1], f->shared->pb_ptr->accesses[2]); TEST_ERROR; } - if ( ( f->shared->pb_ptr->bypasses[0] != 0 ) || - ( f->shared->pb_ptr->bypasses[1] != 0 ) || + if ( ( f->shared->pb_ptr->bypasses[0] != 2 ) || + ( f->shared->pb_ptr->bypasses[1] != 1 ) || ( f->shared->pb_ptr->bypasses[2] != 1 ) ) { - HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {0, 0, 1} expected\n", + HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {2, 1, 1} expected\n", f->shared->pb_ptr->bypasses[0], f->shared->pb_ptr->bypasses[1], f->shared->pb_ptr->bypasses[2]); @@ -2086,26 +2086,25 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) TEST_ERROR; } - if ( ( f->shared->pb_ptr->misses[0] != 10 ) || + if ( ( f->shared->pb_ptr->misses[0] != 9 ) || ( f->shared->pb_ptr->misses[1] != 16 ) || ( f->shared->pb_ptr->misses[2] != 0 ) ) { - HDfprintf(stderr, "misses[] = {%d, %d, %d}. {10, 16, 0} expected\n", + HDfprintf(stderr, "misses[] = {%d, %d, %d}. {9, 16, 0} expected\n", f->shared->pb_ptr->misses[0], f->shared->pb_ptr->misses[1], f->shared->pb_ptr->misses[2]); TEST_ERROR; } - if ( ( f->shared->pb_ptr->evictions[0] != 7 + base_meta_cnt ) || - ( f->shared->pb_ptr->evictions[1] != 9 + base_raw_cnt ) || + if ( ( f->shared->pb_ptr->evictions[0] != 7) || + ( f->shared->pb_ptr->evictions[1] != 9) || ( f->shared->pb_ptr->evictions[2] != 0 ) ) { HDfprintf(stderr, "evictions[] = {%d, %d, %d}. {%d, %d, 0} expected\n", f->shared->pb_ptr->evictions[0], f->shared->pb_ptr->evictions[1], - f->shared->pb_ptr->evictions[2], - 7 + base_meta_cnt, 9 + base_raw_cnt); + f->shared->pb_ptr->evictions[2], 7, 9); TEST_ERROR; } @@ -2120,21 +2119,21 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) evictions, bypasses) < 0) FAIL_STACK_ERROR; - if ( ( accesses[0] != 10 ) || + if ( ( accesses[0] != 9 ) || ( accesses[1] != 16 ) || ( accesses[2] != 0 ) ) { HDfprintf(stderr, - "accesses[] = {%d, %d, %d}. {10, 16, 0} expected\n", + "accesses[] = {%d, %d, %d}. {9, 16, 0} expected\n", accesses[0], accesses[1], accesses[2]); TEST_ERROR; } - if ( ( bypasses[0] != 0 ) || - ( bypasses[1] != 0 ) || + if ( ( bypasses[0] != 2 ) || + ( bypasses[1] != 1 ) || ( bypasses[2] != 1 ) ) { - HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {0, 0, 1} expected\n", + HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {2, 1, 1} expected\n", bypasses[0], bypasses[1], bypasses[2]); TEST_ERROR; } @@ -2148,23 +2147,22 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) TEST_ERROR; } - if ( ( misses[0] != 10 ) || + if ( ( misses[0] != 9 ) || ( misses[1] != 16 ) || ( misses[2] != 0 ) ) { - HDfprintf(stderr, "misses[] = {%d, %d, %d}. {10, 16, 0} expected\n", + HDfprintf(stderr, "misses[] = {%d, %d, %d}. {9, 16, 0} expected\n", misses[0], misses[1], misses[2]); TEST_ERROR; } - if ( ( evictions[0] != 7 + base_meta_cnt ) || - ( evictions[1] != 9 + base_raw_cnt ) || + if ( ( evictions[0] != 7 ) || + ( evictions[1] != 9 ) || ( evictions[2] != 0 ) ) { HDfprintf(stderr, "evictions[] = {%d, %d, %d}. {%d, %d, 0} expected\n", - evictions[0], evictions[1], evictions[2], - 7 + base_meta_cnt, 9 + base_raw_cnt); + evictions[0], evictions[1], evictions[2], 7, 9); TEST_ERROR; } diff --git a/test/testfiles/plist_files/def_fapl_32be b/test/testfiles/plist_files/def_fapl_32be Binary files differindex 6e94011..ed36a07 100644 --- a/test/testfiles/plist_files/def_fapl_32be +++ b/test/testfiles/plist_files/def_fapl_32be diff --git a/test/testfiles/plist_files/def_fapl_32le b/test/testfiles/plist_files/def_fapl_32le Binary files differindex 6e94011..ed36a07 100644 --- a/test/testfiles/plist_files/def_fapl_32le +++ b/test/testfiles/plist_files/def_fapl_32le diff --git a/test/testfiles/plist_files/def_fapl_64be b/test/testfiles/plist_files/def_fapl_64be Binary files differindex 6e94011..ed36a07 100644 --- a/test/testfiles/plist_files/def_fapl_64be +++ b/test/testfiles/plist_files/def_fapl_64be diff --git a/test/testfiles/plist_files/def_fapl_64le b/test/testfiles/plist_files/def_fapl_64le Binary files differindex 6e94011..ed36a07 100644 --- a/test/testfiles/plist_files/def_fapl_64le +++ b/test/testfiles/plist_files/def_fapl_64le diff --git a/test/testfiles/plist_files/fapl_32be b/test/testfiles/plist_files/fapl_32be Binary files differindex 237b291..27afb11 100644 --- a/test/testfiles/plist_files/fapl_32be +++ b/test/testfiles/plist_files/fapl_32be diff --git a/test/testfiles/plist_files/fapl_32le b/test/testfiles/plist_files/fapl_32le Binary files differindex 237b291..27afb11 100644 --- a/test/testfiles/plist_files/fapl_32le +++ b/test/testfiles/plist_files/fapl_32le diff --git a/test/testfiles/plist_files/fapl_64be b/test/testfiles/plist_files/fapl_64be Binary files differindex 237b291..27afb11 100644 --- a/test/testfiles/plist_files/fapl_64be +++ b/test/testfiles/plist_files/fapl_64be diff --git a/test/testfiles/plist_files/fapl_64le b/test/testfiles/plist_files/fapl_64le Binary files differindex 237b291..27afb11 100644 --- a/test/testfiles/plist_files/fapl_64le +++ b/test/testfiles/plist_files/fapl_64le diff --git a/test/testfiles/plist_files/lapl_32be b/test/testfiles/plist_files/lapl_32be Binary files differindex 9d81759..1d61295 100644 --- a/test/testfiles/plist_files/lapl_32be +++ b/test/testfiles/plist_files/lapl_32be diff --git a/test/testfiles/plist_files/lapl_32le b/test/testfiles/plist_files/lapl_32le Binary files differindex 9d81759..1d61295 100644 --- a/test/testfiles/plist_files/lapl_32le +++ b/test/testfiles/plist_files/lapl_32le diff --git a/test/testfiles/plist_files/lapl_64be b/test/testfiles/plist_files/lapl_64be Binary files differindex 9d81759..1d61295 100644 --- a/test/testfiles/plist_files/lapl_64be +++ b/test/testfiles/plist_files/lapl_64be diff --git a/test/testfiles/plist_files/lapl_64le b/test/testfiles/plist_files/lapl_64le Binary files differindex 9d81759..1d61295 100644 --- a/test/testfiles/plist_files/lapl_64le +++ b/test/testfiles/plist_files/lapl_64le |