Fix bugs in tests/ntpd/ntp_prio_q.c. Harlan Stenn.

bk: 56038dd5n1w5hJVyXI0bnWN2b_XmBw

diff --git a/ChangeLog b/ChangeLog
index 8b955ec6b3c47e4d8ecb34735d3cad8b6aeb217a..614617f4b72e5b59147c6490c8ef6965edbe9a07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,7 @@ fixed formatting. Tomasz Flendrich
 * Clean trailing whitespace in tests/ntpd/Makefile.am.  Harlan Stenn.
 * Update the patch for bug 2817.  Harlan Stenn.
 * More updates for bug 2817.  Harlan Stenn.
+* Fix bugs in tests/ntpd/ntp_prio_q.c.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/tests/ntpd/ntp_prio_q.c b/tests/ntpd/ntp_prio_q.c
index cd07c23e7d43420dc6d879f876544c9a971d4459..c2d4f76f03058bca0c7d94a9a5b0d3b489d0fb58 100644 (file)
--- a/tests/ntpd/ntp_prio_q.c
+++ b/tests/ntpd/ntp_prio_q.c
@@ -210,7 +210,7 @@ test_AppendQueues(void) {
        queue* q5 = create_queue();
 
        // append empty queue to empty queue
-       append_queue(q1, q2);
+       append_queue(q1, q2);   // destroys q2
 
        element *e1_ptr, *e2_ptr, *e3_ptr, *e4_ptr, *e5_ptr, *e6_ptr;
        e1_ptr = (element*)debug_get_node(sizeof(element));
@@ -226,18 +226,18 @@ test_AppendQueues(void) {
 
 
        // append empty queue to non empty queue
-       append_queue(q1, q3);
+       append_queue(q1, q3);   // destroys q3
        TEST_ASSERT_EQUAL(3, get_no_of_elements(q1));
 
        // append non empty queue to empty queue
-       append_queue(q4, q1);
+       append_queue(q4, q1);   // destroys q1
        TEST_ASSERT_EQUAL(3, get_no_of_elements(q4));
 
        enqueue(q5, e4_ptr);
        enqueue(q5, e5_ptr);
 
        // append non empty queue to non empty queue
-       append_queue(q4, q5);
+       append_queue(q4, q5);   // destroys q5
        TEST_ASSERT_EQUAL(5, get_no_of_elements(q4));
 
        dequeue(q4);
@@ -254,8 +254,9 @@ test_AppendQueues(void) {
 
        TEST_ASSERT_EQUAL(0, get_no_of_elements(q4));
 
-       destroy_queue(q1);
-       destroy_queue(q2);
-       destroy_queue(q3);
+       // destroy_queue(q1);   // destroyed already
+       // destroy_queue(q2);   // destroyed already
+       // destroy_queue(q3);   // destroyed already
        destroy_queue(q4);
+       // destroy_queue(q5);   // destroyed already
 }