lapd_test: fix: print all messages to stdout, not stderr

We intentionally do not match stderr output because it contains
non-deterministic messages (e.g. pointer addresses), so let's
make sure that all test specific messages go to stdout.

Change-Id: Ia52f8e811cee9d3e1cd5fcda49a9134ccaa31f7f

2 files changed, 38 insertions, 10 deletions

diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c
index f1659ef4..3ea2706d 100644
--- a/tests/lapd/lapd_test.c
+++ b/tests/lapd/lapd_test.c
@@ -306,8 +306,8 @@ static int dequeue_prim(struct lapdm_entity *le, struct osmo_phsap_prim *pp,
 	/* Take message from queue */
 	rc = lapdm_phsap_dequeue_prim(le, pp);
 
-	fprintf(stderr, "dequeue: got rc %d: %s\n", rc,
-		rc <= 0 ? strerror(-rc) : "-");
+	printf("lapdm_phsap_dequeue_prim(): got rc %d: %s\n",
+	       rc, rc <= 0 ? strerror(-rc) : "-");
 
 	if (rc < 0)
 		return rc;
@@ -317,15 +317,14 @@ static int dequeue_prim(struct lapdm_entity *le, struct osmo_phsap_prim *pp,
 		l3_len = msgb_l3len(pp->oph.msg);
 		l2_header_len -= l3_len;
 	} else
-		fprintf(stderr, "MSGB: L3 is undefined\n");
+		printf("MSGB: L3 is undefined\n");
 
 	if (l2_header_len < 0 || l2_header_len > pp->oph.msg->data_len) {
-		fprintf(stderr,
-			"MSGB inconsistent: data = %p, l2 = %p, l3 = %p, tail = %p\n",
-			pp->oph.msg->data,
-			pp->oph.msg->l2h,
-			pp->oph.msg->l3h,
-			pp->oph.msg->tail);
+		printf("MSGB inconsistent: data = %p, l2 = %p, l3 = %p, tail = %p\n",
+		       pp->oph.msg->data,
+		       pp->oph.msg->l2h,
+		       pp->oph.msg->l3h,
+		       pp->oph.msg->tail);
 		l2_header_len = -1;
 	}
 
@@ -571,7 +570,8 @@ static void lapdm_establish(const uint8_t *est_req, size_t est_req_size)
 	/* Send the establish request */
 	msg = create_est_req(est_req, est_req_size);
 	rc = lapdm_rslms_recvmsg(msg, &bts_to_ms_channel);
-	fprintf(stderr, "recvmsg: got rc %d: %s\n", rc, rc <= 0 ? strerror(-rc) : "???");
+	printf("lapdm_rslms_recvmsg(): got rc %d: %s\n",
+	       rc, rc <= 0 ? strerror(-rc) : "???");
 	OSMO_ASSERT(rc == 0);
 
 	/* Take message from queue */
diff --git a/tests/lapd/lapd_test.ok b/tests/lapd/lapd_test.ok
index 835ca2b3..16f6fc3f 100644
--- a/tests/lapd/lapd_test.ok
+++ b/tests/lapd/lapd_test.ok
@@ -5,39 +5,58 @@ bts_to_ms_tx_cb: MS->BTS(us) message 25
 BTS: Verifying CM request.
 
 Confirming
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b 
 ms_to_bts_tx_cb: BTS->MS(us) message 6
 MS: Verifying incoming primitive.
 
 Sending back to MS
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 03 00 0d [L3]> 05 04 0d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 ms_to_bts_tx_cb: BTS->MS(us) message 12
 MS: Verifying incoming MM message: 3
 ms_to_bts_l1_cb: MS(us) -> BTS prim message
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
 
 Sending back to BTS
 ms_to_bts_l1_cb: MS(us) -> BTS prim message
 bts_to_ms_tx_cb: MS->BTS(us) message 14
 BTS: Verifying dummy message.
+lapdm_phsap_dequeue_prim(): got rc 0: Success
+MSGB: L3 is undefined
 Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 01 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
 I test RF channel release of an unestablished channel.
 I test contention resultion by having two mobiles collide and first mobile repeating SABM.
 bts_to_ms_tx_cb: MS->BTS(us) message 25
 BTS: Verifying CM request.
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b 
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b 
 I test RF channel establishment.
 Testing SAPI3/SDCCH
+lapdm_rslms_recvmsg(): got rc 0: Success
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03
 Message: [L2]> 0f 3f 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
 Testing SAPI3/SACCH
+lapdm_rslms_recvmsg(): got rc 0: Success
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from ACCH queue: L2 header size 5, L3 size 18, SAP 0x1000000, 0/0, Link 0x43
 Message: [L2]> 00 00 0f 3f 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
+lapdm_phsap_dequeue_prim(): got rc -19: No such device
 I test if desync problems exist in LAPDm
 
 Establishing SAPI=0
@@ -46,6 +65,7 @@ bts_to_ms_dummy_tx_cb: MS->BTS(us) message 25
 Dumping queue:
 00 00 17 [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 
 
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b 
 
@@ -55,6 +75,8 @@ bts_to_ms_dummy_tx_cb: MS->BTS(us) message 27
 Dumping queue:
 00 00 17 [L2]> 01 21 01 
 
+lapdm_phsap_dequeue_prim(): got rc 0: Success
+MSGB: L3 is undefined
 Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 01 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 
@@ -70,6 +92,7 @@ bts_to_ms_dummy_tx_cb: MS->BTS(us) message 22
 Dumping queue:
 00 00 17 [L2]> 03 40 0d [L3]> 06 35 01 
 
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 03 40 0d [L3]> 06 35 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 
@@ -79,6 +102,8 @@ bts_to_ms_dummy_tx_cb: MS->BTS(us) message 11
 Dumping queue:
 00 00 17 [L2]> 01 61 01 
 
+lapdm_phsap_dequeue_prim(): got rc 0: Success
+MSGB: L3 is undefined
 Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00
 Message: [L2]> 01 61 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 
@@ -87,6 +112,7 @@ bts_to_ms_dummy_tx_cb: MS->BTS(us) message 6
 
 Dumping queue:
 
+lapdm_phsap_dequeue_prim(): got rc 0: Success
 Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03
 Message: [L2]> 0d 73 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 
@@ -94,6 +120,8 @@ Sending CP-DATA
 
 Dumping queue:
 
+lapdm_phsap_dequeue_prim(): got rc 0: Success
+MSGB: L3 is undefined
 Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x03
 Message: [L2]> 0d 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 Success.