On Tue, Jul 30, 2019 at 08:59:33PM -0400, Jeff King wrote: > > OTOH, this is not just any hashmap, but an oidmap, and I could imagine > > that there might be use cases where it would be beneficial if the > > iteration order were to match the oid order (but don't know whether we > > actually have such a use case). > > I don't think we can promise anything about iteration order. This test > is relying on the order at least being deterministic between runs, but > if we added a new entry and had to grow the table, all bets are off. > > So regardless of the endian thing above, it probably does make sense for > any hashmap iteration output to be sorted before comparing. That goes > for t0011, too; it doesn't have this endian thing, but it looks to be > relying on hash order that could change if we swapped out hash > functions. So here's an actual patch. -- >8 -- Subject: [PATCH] t: sort output of hashmap iteration The iteration order of a hashmap is undefined, and may depend on things like the exact set of items added, or the table has been grown or shrunk. In the case of an oidmap, it even depends on endianness, because we take the oid hash by casting sha1 bytes directly into an unsigned int. Let's sort the test-tool output from any hash iterators. In the case of t0011, this is just future-proofing. But for t0016, it actually fixes a reported failure on the big-endian s390 and nonstop ports. I didn't bother to teach the helper functions to optionally sort output. They are short enough that it's simpler to just repeat them inline for the iteration tests than it is to add a --sort option. Reported-by: Randall S. Becker <rsbecker@xxxxxxxxxxxxx> Signed-off-by: Jeff King <peff@xxxxxxxx> --- t/t0011-hashmap.sh | 58 ++++++++++++++++++++++++++++------------------ t/t0016-oidmap.sh | 30 +++++++++++++++--------- 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh index 9c96b3e3b1..5343ffd3f9 100755 --- a/t/t0011-hashmap.sh +++ b/t/t0011-hashmap.sh @@ -170,31 +170,45 @@ NULL ' test_expect_success 'iterate' ' - -test_hashmap "put key1 value1 -put key2 value2 -put fooBarFrotz value3 -iterate" "NULL -NULL -NULL -key2 value2 -key1 value1 -fooBarFrotz value3" - + test-tool hashmap >actual.raw <<-\EOF && + put key1 value1 + put key2 value2 + put fooBarFrotz value3 + iterate + EOF + + cat >expect <<-\EOF && + NULL + NULL + NULL + fooBarFrotz value3 + key1 value1 + key2 value2 + EOF + + sort <actual.raw >actual && + test_cmp expect actual ' test_expect_success 'iterate (case insensitive)' ' - -test_hashmap "put key1 value1 -put key2 value2 -put fooBarFrotz value3 -iterate" "NULL -NULL -NULL -fooBarFrotz value3 -key2 value2 -key1 value1" ignorecase - + test-tool hashmap ignorecase >actual.raw <<-\EOF && + put key1 value1 + put key2 value2 + put fooBarFrotz value3 + iterate + EOF + + cat >expect <<-\EOF && + NULL + NULL + NULL + fooBarFrotz value3 + key1 value1 + key2 value2 + EOF + + sort <actual.raw >actual && + test_cmp expect actual ' test_expect_success 'grow / shrink' ' diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh index bbe719e950..31f8276ba8 100755 --- a/t/t0016-oidmap.sh +++ b/t/t0016-oidmap.sh @@ -86,17 +86,25 @@ NULL" ' test_expect_success 'iterate' ' - -test_oidmap "put one 1 -put two 2 -put three 3 -iterate" "NULL -NULL -NULL -$(git rev-parse two) 2 -$(git rev-parse one) 1 -$(git rev-parse three) 3" - + test-tool oidmap >actual.raw <<-\EOF && + put one 1 + put two 2 + put three 3 + iterate + EOF + + # sort "expect" too so we do not rely on the order of particular oids + sort >expect <<-EOF && + NULL + NULL + NULL + $(git rev-parse one) 1 + $(git rev-parse two) 2 + $(git rev-parse three) 3 + EOF + + sort <actual.raw >actual && + test_cmp expect actual ' test_done -- 2.23.0.rc0.426.gbdee707ba7
