diff options
| -rw-r--r-- | tests/meas/meas_test.c | 27 | ||||
| -rw-r--r-- | tests/meas/meas_test.ok | 456 |
2 files changed, 66 insertions, 417 deletions
diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index c397ddd1..a33a8084 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -895,6 +895,7 @@ void test_lchan_meas_process_measurement(bool no_sacch, bool dropouts) unsigned int i; unsigned int k = 0; unsigned int fn = 0; + unsigned int fn104; struct bts_ul_meas ulm; printf("\n\n"); @@ -918,12 +919,21 @@ void test_lchan_meas_process_measurement(bool no_sacch, bool dropouts) /* feed uplink measurements into the code */ for (i = 0; i < 100; i++) { - if (dropouts == false || i % 4) + fn104 = fn % 104; + ulm.is_sub = 0; + + if (fn104 >= 52 && fn104 <= 59) { + ulm.is_sub = 1; + } + + if (dropouts == false || i % 4) { + if (ulm.is_sub == 1) + printf("(now adding SUB measurement sample %u)\n", fn); lchan_meas_process_measurement(lchan, &ulm, fn); + } else if (ulm.is_sub == 1) + printf("(leaving out SUB measurement sample for frame number %u)\n", fn); else - printf - ("(leaving out measurement sample for frame number %u)\n", - fn); + printf("(leaving out measurement sample for frame number %u)\n", fn); fn += 4; if (k == 2) { @@ -933,12 +943,11 @@ void test_lchan_meas_process_measurement(bool no_sacch, bool dropouts) k++; if (fn % 104 == 39 && no_sacch == false) { - printf - ("(now adding measurement sample for SACCH block)\n"); + printf("(now adding SUB measurement sample for SACCH block at frame number %u)\n", fn); + ulm.is_sub = 1; lchan_meas_process_measurement(lchan, &ulm, fn - 1); - } else - printf - ("(leaving out measurement sample for SACCH block)\n"); + } else if (fn % 104 == 39 && no_sacch == true) + printf("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", fn); } } diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 86d8d871..3d4f4308 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -723,341 +723,73 @@ Testing is_meas_complete() =========================================================== Testing lchan_meas_process_measurement() -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 39) +(now adding SUB measurement sample 52) +(now adding SUB measurement sample 56) +(now adding SUB measurement sample for SACCH block at frame number 143) +(now adding SUB measurement sample 156) +(now adding SUB measurement sample 160) +(now adding SUB measurement sample for SACCH block at frame number 247) +(now adding SUB measurement sample 260) +(now adding SUB measurement sample 264) +(now adding SUB measurement sample for SACCH block at frame number 351) +(now adding SUB measurement sample 364) +(now adding SUB measurement sample 368) =========================================================== Testing lchan_meas_process_measurement() * SACCH blocks not generated. -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 39) +(now adding SUB measurement sample 52) +(now adding SUB measurement sample 56) +(leaving out SUB measurement sample for SACCH block at frame number 143) +(now adding SUB measurement sample 156) +(now adding SUB measurement sample 160) +(leaving out SUB measurement sample for SACCH block at frame number 247) +(now adding SUB measurement sample 260) +(now adding SUB measurement sample 264) +(leaving out SUB measurement sample for SACCH block at frame number 351) +(now adding SUB measurement sample 364) +(now adding SUB measurement sample 368) =========================================================== Testing lchan_meas_process_measurement() * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 17) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 34) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 52) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 39) +(leaving out SUB measurement sample for frame number 52) +(now adding SUB measurement sample 56) (leaving out measurement sample for frame number 69) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 86) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 104) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 121) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 138) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 156) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 143) +(leaving out SUB measurement sample for frame number 156) +(now adding SUB measurement sample 160) (leaving out measurement sample for frame number 173) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 190) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 208) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 225) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 242) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 260) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 247) +(leaving out SUB measurement sample for frame number 260) +(now adding SUB measurement sample 264) (leaving out measurement sample for frame number 277) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 294) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 312) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 329) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 346) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 364) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 351) +(leaving out SUB measurement sample for frame number 364) +(now adding SUB measurement sample 368) (leaving out measurement sample for frame number 381) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 398) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 416) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) =========================================================== @@ -1065,130 +797,38 @@ Testing lchan_meas_process_measurement() * SACCH blocks not generated. * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 17) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 34) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 52) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 39) +(leaving out SUB measurement sample for frame number 52) +(now adding SUB measurement sample 56) (leaving out measurement sample for frame number 69) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 86) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 104) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 121) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 138) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 156) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 143) +(leaving out SUB measurement sample for frame number 156) +(now adding SUB measurement sample 160) (leaving out measurement sample for frame number 173) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 190) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 208) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 225) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 242) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 260) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 247) +(leaving out SUB measurement sample for frame number 260) +(now adding SUB measurement sample 264) (leaving out measurement sample for frame number 277) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 294) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 312) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 329) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 346) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 364) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 351) +(leaving out SUB measurement sample for frame number 364) +(now adding SUB measurement sample 368) (leaving out measurement sample for frame number 381) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 398) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 416) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) =========================================================== |