cellular-infrastructure/osmo-gbproxy
9
0
Fork 0
mirror of https://gerrit.osmocom.org/osmo-gbproxy synced 2024-08-21 18:36:25 +00:00
Code Issues Releases Wiki Activity

mgcp/test: Only include conn_mode into test output

Browse source 
Currently the conn_mode and the output_enabled flags are printed to
stdout.

This patch modifies this to print the output_enabled flags to stderr
instead. The bits in conn_mode are shown as RECV, SEND, and LOOP.
This does not reduce the significance of the test, since there is an
assertion already that verifies the values of the output_enabled
flags with respect to the conn_mode.

Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck 2014-01-30 21:01:32 +01:00 committed by Holger Hans Peter Freyther
parent c8a9245e3a
commit 4c68c5bf54
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
openbsc/tests/mgcp/mgcp_test.c
View file

@ -399,13 +399,22 @@ static void test_messages(void)
else
printf("Requested packetization period not set\n");
if ((endp->conn_mode & CONN_UNMODIFIED) == 0)
printf("Connection mode: %d, "
"BTS output %sabled, NET output %sabled\n",
if ((endp->conn_mode & CONN_UNMODIFIED) == 0) {
printf("Connection mode: %d:%s%s%s%s\n",
endp->conn_mode,
endp->bts_end.output_enabled ? "en" : "dis",
endp->net_end.output_enabled ? "en" : "dis");
else
!endp->conn_mode ? " NONE" : "",
endp->conn_mode & MGCP_CONN_SEND_ONLY ?
" SEND" : "",
endp->conn_mode & MGCP_CONN_RECV_ONLY ?
" RECV" : "",
endp->conn_mode & MGCP_CONN_LOOPBACK &
~MGCP_CONN_RECV_SEND ?
" LOOP" : "");
fprintf(stderr,
"BTS output %sabled, NET output %sabled\n",
endp->bts_end.output_enabled ? "en" : "dis",
endp->net_end.output_enabled ? "en" : "dis");
} else
printf("Connection mode not set\n");
OSMO_ASSERT(endp->net_end.output_enabled ==

18
openbsc/tests/mgcp/mgcp_test.ok
View file

@ -19,7 +19,7 @@ Testing CRCX
Dummy packets: 1
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 1, BTS output enabled, NET output disabled
Connection mode: 1: RECV
Testing MDCX3
Dummy packets: 1
Packet duration not set
@ -29,35 +29,35 @@ Testing MDCX4
Dummy packets: 1
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 3, BTS output enabled, NET output enabled
Connection mode: 3: SEND RECV
Testing MDCX4_PT1
Dummy packets: 1
Detected packet duration: 40
Requested packetetization period: 20-40
Connection mode: 3, BTS output enabled, NET output enabled
Connection mode: 3: SEND RECV
Testing MDCX4_PT2
Dummy packets: 1
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 3, BTS output enabled, NET output enabled
Connection mode: 3: SEND RECV
Testing MDCX4_PT3
Dummy packets: 1
Detected packet duration: 40
Requested packetization period not set
Connection mode: 3, BTS output enabled, NET output enabled
Connection mode: 3: SEND RECV
Testing MDCX4_SO
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 2, BTS output disabled, NET output enabled
Connection mode: 2: SEND
Testing DLCX
Detected packet duration: 20
Requested packetization period not set
Connection mode: 0, BTS output disabled, NET output disabled
Connection mode: 0: NONE
Testing CRCX_ZYN
Dummy packets: 1
Packet duration not set
Requested packetization period not set
Connection mode: 1, BTS output enabled, NET output disabled
Connection mode: 1: RECV
Testing EMPTY
Testing SHORT1
Testing SHORT2
@ -68,7 +68,7 @@ Testing RQNT2
Testing DLCX
Detected packet duration: 20
Requested packetization period not set
Connection mode: 0, BTS output disabled, NET output disabled
Connection mode: 0: NONE
Testing CRCX
Re-transmitting CRCX
Testing RQNT1