Merge branch 'cp/unit-test-reftable-pq'

The tests for "pq" part of reftable library got rewritten to use
the unit test framework.

* cp/unit-test-reftable-pq:
  t-reftable-pq: add tests for merged_iter_pqueue_top()
  t-reftable-pq: add test for index based comparison
  t-reftable-pq: make merged_iter_pqueue_check() callable by reference
  t-reftable-pq: make merged_iter_pqueue_check() static
  t: move reftable/pq_test.c to the unit testing framework
  reftable: change the type of array indices to 'size_t' in reftable/pq.c
  reftable: remove unnecessary curly braces in reftable/pq.c

diff --cc Makefile
index 3863e60b6641897f9923ac41cb0140e58de5f46a,1ee83e98dc587493494fc27e6abc1739feeee306..699af109f70c2aeb8d6f2b34e5bd4fa407651c6c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1340,7 -1340,7 +1340,8 @@@ UNIT_TEST_PROGRAMS += t-oidma
  UNIT_TEST_PROGRAMS += t-oidtree
  UNIT_TEST_PROGRAMS += t-prio-queue
  UNIT_TEST_PROGRAMS += t-reftable-basics
 +UNIT_TEST_PROGRAMS += t-reftable-merged
+ UNIT_TEST_PROGRAMS += t-reftable-pq
  UNIT_TEST_PROGRAMS += t-reftable-record
  UNIT_TEST_PROGRAMS += t-strbuf
  UNIT_TEST_PROGRAMS += t-strcmp-offset
@@@ -2681,7 -2681,7 +2682,6 @@@ REFTABLE_OBJS += reftable/writer.
  
  REFTABLE_TEST_OBJS += reftable/block_test.o
  REFTABLE_TEST_OBJS += reftable/dump.o
- REFTABLE_TEST_OBJS += reftable/pq_test.o
 -REFTABLE_TEST_OBJS += reftable/merged_test.o
  REFTABLE_TEST_OBJS += reftable/readwrite_test.o
  REFTABLE_TEST_OBJS += reftable/stack_test.o
  REFTABLE_TEST_OBJS += reftable/test_framework.o

diff --cc reftable/reftable-tests.h
index d5e03dcc1b6852303147f6857a1fc51f0587133c,67283faf06c2f2fe89641fc45f7e716bb8140da3..3bc1d88d9b6328d941fa6f633b42eb98743750bf
--- 1/reftable/reftable-tests.h
--- 2/reftable/reftable-tests.h
+++ b/reftable/reftable-tests.h
@@@ -11,7 -11,7 +11,6 @@@ https://developers.google.com/open-sour
  
  int basics_test_main(int argc, const char **argv);
  int block_test_main(int argc, const char **argv);
- int pq_test_main(int argc, const char **argv);
 -int merged_test_main(int argc, const char **argv);
  int record_test_main(int argc, const char **argv);
  int readwrite_test_main(int argc, const char **argv);
  int stack_test_main(int argc, const char **argv);

diff --cc t/helper/test-reftable.c
index 9d378427da91d6a235061489a06b30fe65fdafc4,b808ad3e128f6037d4e7ede449ebdca280080fc5..672eaedae0af1913f493070201c1b5d4f3b92292
--- 1/t/helper/test-reftable.c
--- 2/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@@ -7,8 -7,8 +7,7 @@@ int cmd__reftable(int argc, const char 
        /* test from simple to complex. */
        block_test_main(argc, argv);
        tree_test_main(argc, argv);
-       pq_test_main(argc, argv);
        readwrite_test_main(argc, argv);
 -      merged_test_main(argc, argv);
        stack_test_main(argc, argv);
        return 0;
  }