tests/soft_uart: cosmetic: improve readability of the test output

Change-Id: Icf5410f0b292d41532e0cbd17e6ca0509c76cbd5

2 files changed, 93 insertions, 61 deletions

diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c
index 9ca9bd9b..8c12dcdd 100644
--- a/tests/soft_uart/soft_uart_test.c
+++ b/tests/soft_uart/soft_uart_test.c
@@ -24,6 +24,11 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/soft_uart.h>
 
+#define SUART_TEST_BEGIN \
+	do { \
+		printf("\nExecuting %s\n", __func__); \
+	} while (0)
+
 static struct {
 	size_t data_len;
 	const uint8_t *data;
@@ -96,15 +101,17 @@ static void test_rx(void)
 	struct osmo_soft_uart_cfg cfg;
 	struct osmo_soft_uart *suart;
 
+	SUART_TEST_BEGIN;
+
 	suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg);
 	OSMO_ASSERT(suart != NULL);
 
 	osmo_soft_uart_set_rx(suart, true);
 
-	printf("======== %s(): testing 8-N-1 (no data)\n", __func__);
+	printf("======== testing 8-N-1 (no data)\n");
 	test_rx_exec(suart, "F11111F11111F");
 
-	printf("======== %s(): testing 8-N-1 (fill up flush)\n", __func__);
+	printf("======== testing 8-N-1 (fill up flush)\n");
 	cfg = suart_test_default_cfg;
 	cfg.rx_buf_size = 4;
 	osmo_soft_uart_configure(suart, &cfg);
@@ -120,7 +127,7 @@ static void test_rx(void)
 		     "F" /* flush! (for sanity) */
 		     );
 
-	printf("======== %s(): testing 8-N-1 (HELLO)\n", __func__);
+	printf("======== testing 8-N-1 (HELLO)\n");
 	cfg = suart_test_default_cfg;
 	cfg.num_stop_bits = 1;
 	osmo_soft_uart_configure(suart, &cfg);
@@ -134,7 +141,7 @@ static void test_rx(void)
 		     "0 11110010 1F" /* 'O', flush! */
 		     );
 
-	printf("======== %s(): testing 8-N-1 (framing errors)\n", __func__);
+	printf("======== testing 8-N-1 (framing errors)\n");
 	test_rx_exec(suart, "11111" /* no data */
 		     "0 00000000 0" /* stop bit != 1, expect flush */
 		     "0 01010101 0" /* stop bit != 1, expect flush */
@@ -142,7 +149,7 @@ static void test_rx(void)
 		     "F" /* flush! */
 		     );
 
-	printf("======== %s(): testing 8-N-2 (HELLO)\n", __func__);
+	printf("======== testing 8-N-2 (HELLO)\n");
 	cfg = suart_test_default_cfg;
 	cfg.num_stop_bits = 2;
 	osmo_soft_uart_configure(suart, &cfg);
@@ -156,7 +163,7 @@ static void test_rx(void)
 		     "0 11110010 1F1F" /* 'O', flush! */
 		     );
 
-	printf("======== %s(): testing 8-N-2 (framing errors)\n", __func__);
+	printf("======== testing 8-N-2 (framing errors)\n");
 	test_rx_exec(suart, "11111" /* no data */
 		     "0 00000000 00" /* stop bit != 1, expect flush */
 		     "0 01010101 01" /* stop bit != 1, expect flush */
@@ -166,7 +173,7 @@ static void test_rx(void)
 		     );
 
 
-	printf("======== %s(): testing 8-E-1 (invalid parity)\n", __func__);
+	printf("======== testing 8-E-1 (invalid parity)\n");
 	cfg = suart_test_default_cfg;
 	cfg.parity_mode = OSMO_SUART_PARITY_EVEN;
 	osmo_soft_uart_configure(suart, &cfg);
@@ -176,7 +183,7 @@ static void test_rx(void)
 		     "0 11111111 1 1" /* odd parity, expect flush */
 		     "F" /* flush! (for sanity) */
 		     );
-	printf("======== %s(): testing 8-E-1 (valid parity)\n", __func__);
+	printf("======== testing 8-E-1 (valid parity)\n");
 	test_rx_exec(suart, "1111111" /* no data */
 		     "0 00000000 0 1"
 		     "0 11111111 0 1"
@@ -190,7 +197,7 @@ static void test_rx(void)
 		     "F" /* flush! */
 		     );
 
-	printf("======== %s(): testing 8-O-1 (invalid parity)\n", __func__);
+	printf("======== testing 8-O-1 (invalid parity)\n");
 	cfg = suart_test_default_cfg;
 	cfg.parity_mode = OSMO_SUART_PARITY_ODD;
 	osmo_soft_uart_configure(suart, &cfg);
@@ -200,7 +207,7 @@ static void test_rx(void)
 		     "0 11111111 0 1" /* even parity, expect flush */
 		     "F" /* flush! (for sanity) */
 		     );
-	printf("======== %s(): testing 8-O-1 (valid parity)\n", __func__);
+	printf("======== testing 8-O-1 (valid parity)\n");
 	test_rx_exec(suart, "1111111" /* no data */
 		     "0 00000000 1 1"
 		     "0 11111111 1 1"
@@ -267,6 +274,8 @@ static void test_tx_rx(void)
 	struct osmo_soft_uart *suart;
 	int rc;
 
+	SUART_TEST_BEGIN;
+
 	suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg);
 	OSMO_ASSERT(suart != NULL);
 
@@ -280,40 +289,40 @@ static void test_tx_rx(void)
 	osmo_soft_uart_set_tx(suart, true);
 	osmo_soft_uart_set_rx(suart, true);
 
-	printf("======== %s(): testing 8-N-1\n", __func__);
+	printf("======== testing 8-N-1\n");
 	test_tx_rx_exec(suart, (1 + 8 + 1));
 
-	printf("======== %s(): testing 8-N-2\n", __func__);
+	printf("======== testing 8-N-2\n");
 	cfg = suart_test_default_cfg;
 	cfg.num_stop_bits = 2;
 	osmo_soft_uart_configure(suart, &cfg);
 	test_tx_rx_exec(suart, (1 + 8 + 2));
 
-	printf("======== %s(): testing 8-E-1\n", __func__);
+	printf("======== testing 8-E-1\n");
 	cfg = suart_test_default_cfg;
 	cfg.parity_mode = OSMO_SUART_PARITY_EVEN;
 	osmo_soft_uart_configure(suart, &cfg);
 	test_tx_rx_exec(suart, (1 + 8 + 1 + 1));
 
-	printf("======== %s(): testing 8-O-1\n", __func__);
+	printf("======== testing 8-O-1\n");
 	cfg = suart_test_default_cfg;
 	cfg.parity_mode = OSMO_SUART_PARITY_ODD;
 	osmo_soft_uart_configure(suart, &cfg);
 	test_tx_rx_exec(suart, (1 + 8 + 1 + 1));
 
-	printf("======== %s(): testing 8-M-1\n", __func__);
+	printf("======== testing 8-M-1\n");
 	cfg = suart_test_default_cfg;
 	cfg.parity_mode = OSMO_SUART_PARITY_MARK;
 	osmo_soft_uart_configure(suart, &cfg);
 	test_tx_rx_exec(suart, (1 + 8 + 1 + 1));
 
-	printf("======== %s(): testing 8-S-1\n", __func__);
+	printf("======== testing 8-S-1\n");
 	cfg = suart_test_default_cfg;
 	cfg.parity_mode = OSMO_SUART_PARITY_SPACE;
 	osmo_soft_uart_configure(suart, &cfg);
 	test_tx_rx_exec(suart, (1 + 8 + 1 + 1));
 
-	printf("======== %s(): testing 6-N-1\n", __func__);
+	printf("======== testing 6-N-1\n");
 	cfg = suart_test_default_cfg;
 	cfg.num_data_bits = 6;
 	osmo_soft_uart_configure(suart, &cfg);
@@ -328,6 +337,8 @@ static void test_tx_rx_pull_n(unsigned int n)
 	ubit_t tx_buf[32];
 	int rc;
 
+	SUART_TEST_BEGIN;
+
 	suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg);
 	OSMO_ASSERT(suart != NULL);
 
@@ -337,14 +348,14 @@ static void test_tx_rx_pull_n(unsigned int n)
 	g_tx_cb_cfg.data = (void *)"\x55";
 	g_tx_cb_cfg.data_len = 1;
 
-	printf("======== %s(): pulling %lu bits (%u at a time)\n", __func__, sizeof(tx_buf), n);
+	printf("======== pulling %lu bits (%u at a time)\n", sizeof(tx_buf), n);
 	for (unsigned int i = 0; i < sizeof(tx_buf); i += n) {
 		rc = osmo_soft_uart_tx_ubits(suart, &tx_buf[i], n);
 		OSMO_ASSERT(rc == n);
 	}
 	printf("%s\n", osmo_ubit_dump(&tx_buf[0], sizeof(tx_buf)));
 
-	printf("======== %s(): feeding %lu bits into the receiver\n", __func__, sizeof(tx_buf));
+	printf("======== feeding %lu bits into the receiver\n", sizeof(tx_buf));
 	rc = osmo_soft_uart_rx_ubits(suart, &tx_buf[0], sizeof(tx_buf));
 	OSMO_ASSERT(rc == 0);
 	osmo_soft_uart_flush_rx(suart);
@@ -357,11 +368,12 @@ static void test_modem_status(void)
 	struct osmo_soft_uart *suart;
 	unsigned int status;
 
+	SUART_TEST_BEGIN;
+
 	suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg);
 	OSMO_ASSERT(suart != NULL);
 
-	printf("======== %s(): initial status=0x%08x\n",
-	       __func__, osmo_soft_uart_get_status(suart));
+	printf("initial status=0x%08x\n", osmo_soft_uart_get_status(suart));
 
 	printf("de-asserting DCD, which was not asserted\n");
 	osmo_soft_uart_set_status_line(suart, OSMO_SUART_STATUS_F_DCD, false);
@@ -392,6 +404,8 @@ static void test_flow_control_dtr_dsr(void)
 	ubit_t tx_buf[40];
 	int rc;
 
+	SUART_TEST_BEGIN;
+
 	g_tx_cb_cfg.data = (void *)"\x42\x42\x42\x42";
 	g_tx_cb_cfg.data_len = 4;
 
@@ -405,8 +419,7 @@ static void test_flow_control_dtr_dsr(void)
 	osmo_soft_uart_set_rx(suart, true);
 
 	/* expect the initial status to be 0 (all lines de-asserted) */
-	printf("======== %s(): initial status=0x%08x\n",
-	       __func__, osmo_soft_uart_get_status(suart));
+	printf("initial status=0x%08x\n", osmo_soft_uart_get_status(suart));
 
 	memset(&tx_buf[0], 1, sizeof(tx_buf)); /* pre-initialize */
 
@@ -420,7 +433,7 @@ static void test_flow_control_dtr_dsr(void)
 	osmo_soft_uart_flush_rx(suart);
 
 	/* both DTR and DSR are asserted, expect both Rx and Tx to work */
-	printf("======== %s(): asserting both DTR and DSR\n", __func__);
+	printf("======== asserting both DTR and DSR\n");
 	osmo_soft_uart_set_status_line(suart, OSMO_SUART_STATUS_F_DTR, true);
 	osmo_soft_uart_set_status_line(suart, OSMO_SUART_STATUS_F_DSR, true);
 
@@ -449,7 +462,7 @@ static void test_flow_control_dtr_dsr(void)
 	OSMO_ASSERT(rc == 2);
 
 	/* CTS gets de-asserted, the transmitter is shutting down */
-	printf("======== %s(): de-asserting DSR\n", __func__);
+	printf("======== de-asserting DSR\n");
 	osmo_soft_uart_set_status_line(suart, OSMO_SUART_STATUS_F_DSR, false);
 
 	/* expect only the remaining 8 bits to be pulled out */
@@ -474,6 +487,8 @@ static void test_flow_control_rts_cts(void)
 	ubit_t tx_buf[40];
 	int rc;
 
+	SUART_TEST_BEGIN;
+
 	g_tx_cb_cfg.data = (void *)"\x42\x42\x42\x42";
 	g_tx_cb_cfg.data_len = 4;
 
@@ -487,8 +502,7 @@ static void test_flow_control_rts_cts(void)
 	osmo_soft_uart_set_rx(suart, true);
 
 	/* expect the initial status to be 0 (all lines de-asserted) */
-	printf("======== %s(): initial status=0x%08x\n",
-	       __func__, osmo_soft_uart_get_status(suart));
+	printf("initial status=0x%08x\n", osmo_soft_uart_get_status(suart));
 
 	memset(&tx_buf[0], 1, sizeof(tx_buf)); /* pre-initialize */
 
@@ -502,7 +516,7 @@ static void test_flow_control_rts_cts(void)
 	osmo_soft_uart_flush_rx(suart);
 
 	/* both RTS/RTR and CTS are asserted, expect both Rx and Tx to work */
-	printf("======== %s(): asserting both CTS and RTS/RTR\n", __func__);
+	printf("======== asserting both CTS and RTS/RTR\n");
 	osmo_soft_uart_set_status_line(suart, OSMO_SUART_STATUS_F_CTS, true);
 	osmo_soft_uart_set_status_line(suart, OSMO_SUART_STATUS_F_RTS_RTR, true);
 
@@ -531,7 +545,7 @@ static void test_flow_control_rts_cts(void)
 	OSMO_ASSERT(rc == 2);
 
 	/* CTS gets de-asserted, the transmitter is shutting down */
-	printf("======== %s(): de-asserting CTS\n", __func__);
+	printf("======== de-asserting CTS\n");
 	osmo_soft_uart_set_status_line(suart, OSMO_SUART_STATUS_F_CTS, false);
 
 	/* expect only the remaining 8 bits to be pulled out */
diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok
index 7922074b..6edac16b 100644
--- a/tests/soft_uart/soft_uart_test.ok
+++ b/tests/soft_uart/soft_uart_test.ok
@@ -1,12 +1,14 @@
-======== test_rx(): testing 8-N-1 (no data)
+
+Executing test_rx
+======== testing 8-N-1 (no data)
 test_rx_exec() @ 0: flush the Rx buffer
 test_rx_exec() @ 6: flush the Rx buffer
 test_rx_exec() @ 12: flush the Rx buffer
-======== test_rx(): testing 8-N-1 (fill up flush)
+======== testing 8-N-1 (fill up flush)
 suart_rx_cb(flags=00): de ad be ef 
 suart_rx_cb(flags=00): 00 aa 55 ff 
 test_rx_exec() @ 101: flush the Rx buffer
-======== test_rx(): testing 8-N-1 (HELLO)
+======== testing 8-N-1 (HELLO)
 test_rx_exec() @ 18: flush the Rx buffer
 suart_rx_cb(flags=00): 48 
 test_rx_exec() @ 31: flush the Rx buffer
@@ -17,12 +19,12 @@ test_rx_exec() @ 70: flush the Rx buffer
 suart_rx_cb(flags=00): 4c 
 test_rx_exec() @ 96: flush the Rx buffer
 suart_rx_cb(flags=00): 4f 
-======== test_rx(): testing 8-N-1 (framing errors)
+======== testing 8-N-1 (framing errors)
 suart_rx_cb(flags=01): 00 
 suart_rx_cb(flags=01): aa 
 test_rx_exec() @ 41: flush the Rx buffer
 suart_rx_cb(flags=00): ff 
-======== test_rx(): testing 8-N-2 (HELLO)
+======== testing 8-N-2 (HELLO)
 test_rx_exec() @ 20: flush the Rx buffer
 test_rx_exec() @ 22: flush the Rx buffer
 suart_rx_cb(flags=00): 48 
@@ -38,35 +40,37 @@ suart_rx_cb(flags=00): 4c
 test_rx_exec() @ 110: flush the Rx buffer
 test_rx_exec() @ 112: flush the Rx buffer
 suart_rx_cb(flags=00): 4f 
-======== test_rx(): testing 8-N-2 (framing errors)
+======== testing 8-N-2 (framing errors)
 suart_rx_cb(flags=01): 00 
 suart_rx_cb(flags=01): aa 
 suart_rx_cb(flags=01): 55 
 test_rx_exec() @ 57: flush the Rx buffer
 suart_rx_cb(flags=00): ff 
-======== test_rx(): testing 8-E-1 (invalid parity)
+======== testing 8-E-1 (invalid parity)
 suart_rx_cb(flags=02): 00 
 suart_rx_cb(flags=02): 01 
 suart_rx_cb(flags=02): ff 
 test_rx_exec() @ 49: flush the Rx buffer
 suart_rx_cb(flags=02): 
-======== test_rx(): testing 8-E-1 (valid parity)
+======== testing 8-E-1 (valid parity)
 test_rx_exec() @ 63: flush the Rx buffer
 suart_rx_cb(flags=00): 00 ff aa 55 
 test_rx_exec() @ 120: flush the Rx buffer
 suart_rx_cb(flags=00): 80 e0 f8 fe 
-======== test_rx(): testing 8-O-1 (invalid parity)
+======== testing 8-O-1 (invalid parity)
 suart_rx_cb(flags=02): 00 
 suart_rx_cb(flags=02): 01 
 suart_rx_cb(flags=02): ff 
 test_rx_exec() @ 42: flush the Rx buffer
 suart_rx_cb(flags=02): 
-======== test_rx(): testing 8-O-1 (valid parity)
+======== testing 8-O-1 (valid parity)
 test_rx_exec() @ 63: flush the Rx buffer
 suart_rx_cb(flags=00): 00 ff aa 55 
 test_rx_exec() @ 120: flush the Rx buffer
 suart_rx_cb(flags=00): 80 e0 f8 fe 
-======== test_tx_rx(): testing 8-N-1
+
+Executing test_tx_rx
+======== testing 8-N-1
 suart_tx_cb(len=4/4): de ad be ef 
 suart_rx_cb(flags=00): de ad be ef 
 test_tx_rx_exec_one(n_bits_total=40): 0011110111 0101101011 0011111011 0111101111
@@ -81,7 +85,7 @@ suart_rx_cb(flags=00): 10 20 40 80
 test_tx_rx_exec_one(n_bits_total=40): 0000010001 0000001001 0000000101 0000000011
 suart_tx_cb(len=0/4): 
 test_tx_rx_exec_one(n_bits_total=40): 1111111111 1111111111 1111111111 1111111111
-======== test_tx_rx(): testing 8-N-2
+======== testing 8-N-2
 suart_tx_cb(len=4/4): de ad be ef 
 suart_rx_cb(flags=00): de ad be ef 
 test_tx_rx_exec_one(n_bits_total=44): 00111101111 01011010111 00111110111 01111011111
@@ -96,7 +100,7 @@ suart_rx_cb(flags=00): 10 20 40 80
 test_tx_rx_exec_one(n_bits_total=44): 00000100011 00000010011 00000001011 00000000111
 suart_tx_cb(len=0/4): 
 test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111
-======== test_tx_rx(): testing 8-E-1
+======== testing 8-E-1
 suart_tx_cb(len=4/4): de ad be ef 
 suart_rx_cb(flags=00): de ad be ef 
 test_tx_rx_exec_one(n_bits_total=44): 00111101101 01011010111 00111110101 01111011111
@@ -111,7 +115,7 @@ suart_rx_cb(flags=00): 10 20 40 80
 test_tx_rx_exec_one(n_bits_total=44): 00000100011 00000010011 00000001011 00000000111
 suart_tx_cb(len=0/4): 
 test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111
-======== test_tx_rx(): testing 8-O-1
+======== testing 8-O-1
 suart_tx_cb(len=4/4): de ad be ef 
 suart_rx_cb(flags=00): de ad be ef 
 test_tx_rx_exec_one(n_bits_total=44): 00111101111 01011010101 00111110111 01111011101
@@ -126,7 +130,7 @@ suart_rx_cb(flags=00): 10 20 40 80
 test_tx_rx_exec_one(n_bits_total=44): 00000100001 00000010001 00000001001 00000000101
 suart_tx_cb(len=0/4): 
 test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111
-======== test_tx_rx(): testing 8-M-1
+======== testing 8-M-1
 suart_tx_cb(len=4/4): de ad be ef 
 suart_rx_cb(flags=00): de ad be ef 
 test_tx_rx_exec_one(n_bits_total=44): 00111101111 01011010111 00111110111 01111011111
@@ -141,7 +145,7 @@ suart_rx_cb(flags=00): 10 20 40 80
 test_tx_rx_exec_one(n_bits_total=44): 00000100011 00000010011 00000001011 00000000111
 suart_tx_cb(len=0/4): 
 test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111
-======== test_tx_rx(): testing 8-S-1
+======== testing 8-S-1
 suart_tx_cb(len=4/4): de ad be ef 
 suart_rx_cb(flags=00): de ad be ef 
 test_tx_rx_exec_one(n_bits_total=44): 00111101101 01011010101 00111110101 01111011101
@@ -156,7 +160,7 @@ suart_rx_cb(flags=00): 10 20 40 80
 test_tx_rx_exec_one(n_bits_total=44): 00000100001 00000010001 00000001001 00000000101
 suart_tx_cb(len=0/4): 
 test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111
-======== test_tx_rx(): testing 6-N-1
+======== testing 6-N-1
 suart_tx_cb(len=4/4): de ad be ef 
 suart_rx_cb(flags=00): 1e 2d 3e 2f 
 test_tx_rx_exec_one(n_bits_total=32): 00111101 01011011 00111111 01111011
@@ -171,36 +175,46 @@ suart_rx_cb(flags=00): 10 20 00 00
 test_tx_rx_exec_one(n_bits_total=32): 00000101 00000011 00000001 00000001
 suart_tx_cb(len=0/4): 
 test_tx_rx_exec_one(n_bits_total=32): 11111111 11111111 11111111 11111111
-======== test_tx_rx_pull_n(): pulling 32 bits (1 at a time)
+
+Executing test_tx_rx_pull_n
+======== pulling 32 bits (1 at a time)
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 01010101010101010101010101010101
-======== test_tx_rx_pull_n(): feeding 32 bits into the receiver
+======== feeding 32 bits into the receiver
 suart_rx_cb(flags=00): 55 55 55 
-======== test_tx_rx_pull_n(): pulling 32 bits (2 at a time)
+
+Executing test_tx_rx_pull_n
+======== pulling 32 bits (2 at a time)
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 01010101010101010101010101010101
-======== test_tx_rx_pull_n(): feeding 32 bits into the receiver
+======== feeding 32 bits into the receiver
 suart_rx_cb(flags=00): 55 55 55 
-======== test_tx_rx_pull_n(): pulling 32 bits (4 at a time)
+
+Executing test_tx_rx_pull_n
+======== pulling 32 bits (4 at a time)
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 01010101011101010101011101010101
-======== test_tx_rx_pull_n(): feeding 32 bits into the receiver
+======== feeding 32 bits into the receiver
 suart_rx_cb(flags=00): 55 55 
-======== test_tx_rx_pull_n(): pulling 32 bits (8 at a time)
+
+Executing test_tx_rx_pull_n
+======== pulling 32 bits (8 at a time)
 suart_tx_cb(len=1/1): 55 
 suart_tx_cb(len=1/1): 55 
 01010101011111110101010101111111
-======== test_tx_rx_pull_n(): feeding 32 bits into the receiver
+======== feeding 32 bits into the receiver
 suart_rx_cb(flags=00): 55 55 
-======== test_modem_status(): initial status=0x00000000
+
+Executing test_modem_status
+initial status=0x00000000
 de-asserting DCD, which was not asserted
 asserting both RI and DCD, expecting the callback to be called twice
 suart_status_change_cb(status=0x00000008)
@@ -209,10 +223,12 @@ de-asserting RI, expecting the callback to be called
 suart_status_change_cb(status=0x00000002)
 resetting to 0x00, expecting the callback to be called
 suart_status_change_cb(status=0x00000000)
-======== test_flow_control_dtr_dsr(): initial status=0x00000000
+
+Executing test_flow_control_dtr_dsr
+initial status=0x00000000
 expecting osmo_soft_uart_tx_ubits() to yield nothing
 expecting osmo_soft_uart_rx_ubits() to yield nothing
-======== test_flow_control_dtr_dsr(): asserting both DTR and DSR
+======== asserting both DTR and DSR
 suart_status_change_cb(status=0x00000001)
 suart_status_change_cb(status=0x00000005)
 expecting osmo_soft_uart_tx_ubits() to yield 40 bits (requesting 40 bits)
@@ -222,15 +238,17 @@ expecting osmo_soft_uart_rx_ubits() to consume 40 bits and yield 4 chars
 suart_rx_cb(flags=00): 42 42 42 42 
 expecting osmo_soft_uart_tx_ubits() to yield 2 bits (requesting 2 bits)
 suart_tx_cb(len=1/1): 42 
-======== test_flow_control_dtr_dsr(): de-asserting DSR
+======== de-asserting DSR
 suart_status_change_cb(status=0x00000001)
 expecting osmo_soft_uart_tx_ubits() to yield 8 bits (requesting 40 bits)
 expecting osmo_soft_uart_rx_ubits() to consume 40 bits and yield a pending char
 suart_rx_cb(flags=00): 42 
-======== test_flow_control_rts_cts(): initial status=0x00000000
+
+Executing test_flow_control_rts_cts
+initial status=0x00000000
 expecting osmo_soft_uart_tx_ubits() to yield nothing
 expecting osmo_soft_uart_rx_ubits() to yield nothing
-======== test_flow_control_rts_cts(): asserting both CTS and RTS/RTR
+======== asserting both CTS and RTS/RTR
 suart_status_change_cb(status=0x00000020)
 suart_status_change_cb(status=0x00000030)
 expecting osmo_soft_uart_tx_ubits() to yield 40 bits (requesting 40 bits)
@@ -240,7 +258,7 @@ expecting osmo_soft_uart_rx_ubits() to consume 40 bits and yield 4 chars
 suart_rx_cb(flags=00): 42 42 42 42 
 expecting osmo_soft_uart_tx_ubits() to yield 2 bits (requesting 2 bits)
 suart_tx_cb(len=1/1): 42 
-======== test_flow_control_rts_cts(): de-asserting CTS
+======== de-asserting CTS
 suart_status_change_cb(status=0x00000010)
 expecting osmo_soft_uart_tx_ubits() to yield 8 bits (requesting 40 bits)
 expecting osmo_soft_uart_rx_ubits() to consume 40 bits and yield a pending char