April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: tests/amr: add a unit test for amr_parse_mr_conf()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27761 ) Change subject: tests/amr: add a unit test for amr_parse_mr_conf() ...................................................................... tests/amr: add a unit test for amr_parse_mr_conf() This unit test demonstrates a problem in amr_parse_mr_conf(): the threshold and hysteresis values are parsed incorrectly. They are expected to match what we have in amr_fr_bts_mode_def[]: Mode[0] = 0/13/4 Mode[1] = 2/25/4 Mode[2] = 5/37/4 This will be fixed in a follow-up patch. Change-Id: Iab7e8878e62f598959e80fcb7e729b7f496962a2 Related: SYS#5917, OS#4984 --- M tests/amr/Makefile.am M tests/amr/amr_test.c A tests/amr/amr_test.err M tests/amr/amr_test.ok M tests/testsuite.at 5 files changed, 55 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/tests/amr/Makefile.am b/tests/amr/Makefile.am index 5da63ff..607d051 100644 --- a/tests/amr/Makefile.am +++ b/tests/amr/Makefile.am @@ -4,7 +4,7 @@ LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) $(LIBOSMOTRAU_LIBS) noinst_PROGRAMS = amr_test -EXTRA_DIST = amr_test.ok +EXTRA_DIST = amr_test.ok amr_test.err amr_test_SOURCES = amr_test.c amr_test_LDADD = $(top_builddir)/src/common/libbts.a \ diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c index 4efbf40..941212a 100644 --- a/tests/amr/amr_test.c +++ b/tests/amr/amr_test.c @@ -19,7 +19,12 @@ */ #include <osmo-bts/logging.h> +#include <osmo-bts/bts.h> +#include <osmo-bts/amr.h> + +#include <osmocom/core/application.h> #include <osmocom/core/utils.h> + #include <stdlib.h> #include <stdio.h> #include "../../src/osmo-bts-trx/sched_utils.h" @@ -143,9 +148,44 @@ } } +static void test_amr_parse_mr_conf(void) +{ + uint8_t mrc_enc[] = { 0x20, 0xa5, 0x0d, 0x46, 0x52, 0x54 }; + struct amr_multirate_conf mrc = { 0 }; + unsigned int i; + + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], sizeof(mrc_enc))); + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], sizeof(mrc_enc)) > 0); + printf("amr_parse_mr_conf() -> num_modes=%u\n", mrc.num_modes); + for (i = 0; i < mrc.num_modes; i++) { + printf(" Mode[%u] = %u/%u/%u\n", + i, mrc.bts_mode[i].mode, + mrc.bts_mode[i].threshold, + mrc.bts_mode[i].hysteresis); + } + + mrc_enc[1] = 0xff; /* all codec modes active */ + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], sizeof(mrc_enc))); + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], sizeof(mrc_enc)) == -EINVAL); + + mrc_enc[0] = 0xff; /* unknown version */ + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], sizeof(mrc_enc))); + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], sizeof(mrc_enc)) == -EINVAL); + + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], 1)); /* short read */ + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], 1) == -EINVAL); +} + int main(int argc, char **argv) { + osmo_init_logging2(NULL, &bts_log_info); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); test_amr_cmi_sched(); + test_amr_parse_mr_conf(); return EXIT_SUCCESS; } diff --git a/tests/amr/amr_test.err b/tests/amr/amr_test.err new file mode 100644 index 0000000..0b7bdaf --- /dev/null +++ b/tests/amr/amr_test.err @@ -0,0 +1,3 @@ +DRSL ERROR AMR Multirate with 8 modes len=6 not possible +DRSL ERROR AMR Multirate Version 7 unknown +DRSL ERROR AMR Multirate IE is too short (1) diff --git a/tests/amr/amr_test.ok b/tests/amr/amr_test.ok index ec1d1a0..6b42e09 100644 --- a/tests/amr/amr_test.ok +++ b/tests/amr/amr_test.ok @@ -150,3 +150,12 @@ Downlink, AMR AFS: fn_begin=91, CMI=1 Downlink, AMR AFS: fn_begin=95, CMI=0 Downlink, AMR AFS: fn_begin=99, CMI=1 +amr_parse_mr_conf() <- 20 a5 0d 46 52 54 +amr_parse_mr_conf() -> num_modes=4 + Mode[0] = 0/37/0 + Mode[1] = 2/53/1 + Mode[2] = 5/37/2 + Mode[3] = 7/0/0 +amr_parse_mr_conf() <- 20 ff 0d 46 52 54 +amr_parse_mr_conf() <- ff ff 0d 46 52 54 +amr_parse_mr_conf() <- ff diff --git a/tests/testsuite.at b/tests/testsuite.at index f2d17fb..7e6ec4b 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -67,5 +67,6 @@ AT_SETUP([amr]) AT_KEYWORDS([amr]) cat $abs_srcdir/amr/amr_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/amr/amr_test], [], [expout], [ignore]) +cat $abs_srcdir/amr/amr_test.err > experr +AT_CHECK([$abs_top_builddir/tests/amr/amr_test], [], [expout], [experr]) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iab7e8878e62f598959e80fcb7e729b7f496962a2 Gerrit-Change-Number: 27761 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: tests/amr/Makefile.am: use proper binary name prefix 'amr_test_'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27760 ) Change subject: tests/amr/Makefile.am: use proper binary name prefix 'amr_test_' ...................................................................... tests/amr/Makefile.am: use proper binary name prefix 'amr_test_' Both misc_test_{SOURCES,LDADD} were simply ignored because binary 'misc_test' is not listed in noinst_PROGRAMS... Change-Id: Ia1739bab76261ff6d50824462b8ed2e0b34fb464 Related: SYS#5917, OS#4984 --- M tests/amr/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/tests/amr/Makefile.am b/tests/amr/Makefile.am index dc0f1b8..5da63ff 100644 --- a/tests/amr/Makefile.am +++ b/tests/amr/Makefile.am @@ -6,6 +6,6 @@ noinst_PROGRAMS = amr_test EXTRA_DIST = amr_test.ok -misc_test_SOURCES = amr_test.c -misc_test_LDADD = $(top_builddir)/src/common/libbts.a \ +amr_test_SOURCES = amr_test.c +amr_test_LDADD = $(top_builddir)/src/common/libbts.a \ $(LDADD) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia1739bab76261ff6d50824462b8ed2e0b34fb464 Gerrit-Change-Number: 27760 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: use hard-coded defaults if the MultiRate conf IE is absent

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27757 ) Change subject: rsl: use hard-coded defaults if the MultiRate conf IE is absent ...................................................................... rsl: use hard-coded defaults if the MultiRate conf IE is absent This configuration will be used as a fall-back when the MultiRate configuration IE is not included in the CHAN ACT/MODIFY messages. Change-Id: Ie96af636105ee1ffe2d9a0bd9eea375faebad149 Related: osmo-bsc.git Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917, OS#4984 --- M include/osmo-bts/amr.h M src/common/amr.c M src/common/rsl.c 3 files changed, 107 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmo-bts/amr.h b/include/osmo-bts/amr.h index f313287..3fa4b8f 100644 --- a/include/osmo-bts/amr.h +++ b/include/osmo-bts/amr.h @@ -14,5 +14,6 @@ void amr_set_mode_pref(uint8_t *data, const struct amr_multirate_conf *amr_mrc, uint8_t cmi, uint8_t cmr); unsigned int amr_get_initial_mode(struct gsm_lchan *lchan); +void amr_init_mr_conf_def(struct gsm_lchan *lchan); #endif /* _OSMO_BTS_AMR_H */ diff --git a/src/common/amr.c b/src/common/amr.c index 837757f..53ce24d 100644 --- a/src/common/amr.c +++ b/src/common/amr.c @@ -6,6 +6,85 @@ #include <osmo-bts/logging.h> #include <osmo-bts/amr.h> +/* Reasonable defaults for AMR-FR and AMR-HR rate configuration. + * The values are taken from 3GPP TS 51.010-1 (version 13.11.0). + * See 14.2.19.4.1 and 14.2.20.4.1 for AMR-FR and AMR-HR, respectively. + * + * ^ C/I (dB) | FR / HR | + * | | + * | | + * MODE4 | | + * = | ----+---- THR_MX_Up(3) | 20.5 / 18.0 | + * | | | + * | = ----+---- THR_MX_Dn(4) | 18.5 / 16.0 | + * MODE3 | | + * | = ----+---- THR_MX_Up(2) | 14.5 / 14.0 | + * | | | + * = | ----+---- THR_MX_Dn(3) | 12.5 / 12.0 | + * MODE2 | | + * = | ----+---- THR_MX_Up(1) | 8.5 / 10.0 | + * | | | + * | = ----+---- THR_MX_Dn(2) | 6.5 / 8.0 | + * MODE1 | | + * | | + * | | + */ +static const struct gsm48_multi_rate_conf amr_fr_mr_cfg_def = { + .m4_75 = 1, + .m5_90 = 1, + .m7_95 = 1, + .m12_2 = 1, +}; +static const struct amr_mode amr_fr_bts_mode_def[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 13, /* THR_MX_Dn(2): 6.5 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 8.5 dB */ + }, + { + .mode = 2, /* 5.90k */ + .threshold = 25, /* THR_MX_Dn(3): 12.5 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.5 dB */ + }, + { + .mode = 5, /* 7.95k */ + .threshold = 37, /* THR_MX_Dn(4): 18.5 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 20.5 dB */ + }, + { + .mode = 7, /* 12.2k */ + /* this is the last mode, so no threshold */ + }, +}; + +static const struct gsm48_multi_rate_conf amr_hr_mr_cfg_def = { + .m4_75 = 1, + .m5_90 = 1, + .m6_70 = 1, + .m7_95 = 1, +}; +static const struct amr_mode amr_hr_bts_mode_def[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 16, /* THR_MX_Dn(2): 8.0 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 10.0 dB */ + }, + { + .mode = 2, /* 5.90k */ + .threshold = 24, /* THR_MX_Dn(3): 12.0 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.0 dB */ + }, + { + .mode = 3, /* 6.70k */ + .threshold = 32, /* THR_MX_Dn(4): 16.0 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 18.0 dB */ + }, + { + .mode = 5, /* 7.95k */ + /* this is the last mode, so no threshold */ + }, +}; + void amr_log_mr_conf(int ss, int logl, const char *pfx, struct amr_multirate_conf *amr_mrc) { @@ -171,3 +250,26 @@ } } } + +void amr_init_mr_conf_def(struct gsm_lchan *lchan) +{ + const struct gsm48_multi_rate_conf *mr_cfg; + const struct amr_mode *bts_mode; + unsigned int num_modes; + + if (lchan->type == GSM_LCHAN_TCH_F) { + num_modes = ARRAY_SIZE(amr_fr_bts_mode_def); + bts_mode = &amr_fr_bts_mode_def[0]; + mr_cfg = &amr_fr_mr_cfg_def; + } else { + num_modes = ARRAY_SIZE(amr_hr_bts_mode_def); + bts_mode = &amr_hr_bts_mode_def[0]; + mr_cfg = &amr_hr_mr_cfg_def; + } + + memcpy(lchan->tch.amr_mr.gsm48_ie, mr_cfg, + sizeof(lchan->tch.amr_mr.gsm48_ie)); + memcpy(&lchan->tch.amr_mr.bts_mode[0], &bts_mode[0], + sizeof(lchan->tch.amr_mr.bts_mode)); + lchan->tch.amr_mr.num_modes = num_modes; +} diff --git a/src/common/rsl.c b/src/common/rsl.c index 59bc799..94d0022 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1644,7 +1644,9 @@ if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) { LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "Missing MultiRate conf IE " "(TCH mode is %s)\n", gsm48_chan_mode_name(lchan->tch_mode)); - /* TODO: init lchan->tch.amr_mr with some default values */ + /* Init lchan->tch.amr_mr with hard-coded default values */ + amr_init_mr_conf_def(lchan); + goto parsed; } return 0; } @@ -1664,6 +1666,7 @@ return -RSL_ERR_IE_CONTENT; } +parsed: amr_log_mr_conf(DRTP, LOGL_DEBUG, gsm_lchan_name(lchan), &lchan->tch.amr_mr); lchan->tch.last_cmr = AMR_CMR_NONE; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie96af636105ee1ffe2d9a0bd9eea375faebad149 Gerrit-Change-Number: 27757 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27797 ) Change subject: osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params ...................................................................... osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params The default AMR link adaptation parameters have been changed in the recent osmo-bsc, so set the old expected default explicitly. Change-Id: Ic1c46d54ef97278100bd52156ad5627418ef5c97 Related: osmo-bsc.git Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917 --- M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg 2 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/97/27797/1 diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index 861bcc8..a128946 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -90,6 +90,18 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr + amr tch-f modes 0 2 4 7 + amr tch-f threshold ms 32 32 32 + amr tch-f hysteresis ms 8 8 8 + amr tch-f threshold bts 32 32 32 + amr tch-f hysteresis bts 8 8 8 + amr tch-f start-mode auto + amr tch-h modes 0 2 4 + amr tch-h threshold ms 32 32 + amr tch-h hysteresis ms 8 8 + amr tch-h threshold bts 32 32 + amr tch-h hysteresis bts 8 8 + amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index 5731014..0ca91ef 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -93,6 +93,18 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr + amr tch-f modes 0 2 4 7 + amr tch-f threshold ms 32 32 32 + amr tch-f hysteresis ms 8 8 8 + amr tch-f threshold bts 32 32 32 + amr tch-f hysteresis bts 8 8 8 + amr tch-f start-mode auto + amr tch-h modes 0 2 4 + amr tch-h threshold ms 32 32 + amr tch-h hysteresis ms 8 8 + amr tch-h threshold bts 32 32 + amr tch-h hysteresis bts 8 8 + amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1c46d54ef97278100bd52156ad5627418ef5c97 Gerrit-Change-Number: 27797 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27796 ) Change subject: bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters ...................................................................... bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters The default AMR link adaptation parameters have been changed in the recent osmo-bsc, so set the old expected default explicitly. Change-Id: I320d91a35bc50bdfe87c0384035a10b8672ef23c Related: osmo-bsc.git Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917 --- M bsc/osmo-bsc.cfg 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/27796/1 diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index f5c9c16..63a82b0 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -95,6 +95,18 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr hr efr amr + amr tch-f modes 0 2 4 7 + amr tch-f threshold ms 32 32 32 + amr tch-f hysteresis ms 8 8 8 + amr tch-f threshold bts 32 32 32 + amr tch-f hysteresis bts 8 8 8 + amr tch-f start-mode auto + amr tch-h modes 0 2 4 + amr tch-h threshold ms 32 32 + amr tch-h hysteresis ms 8 8 + amr tch-h threshold bts 32 32 + amr tch-h hysteresis bts 8 8 + amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I320d91a35bc50bdfe87c0384035a10b8672ef23c Gerrit-Change-Number: 27796 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: use hard-coded defaults if the MultiRate conf IE is absent

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27757 ) Change subject: rsl: use hard-coded defaults if the MultiRate conf IE is absent ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: Re-applying Pau's CR+1. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie96af636105ee1ffe2d9a0bd9eea375faebad149 Gerrit-Change-Number: 27757 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 19:24:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-trx[master]: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/27788 ) Change subject: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' ...................................................................... tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' When using 'check_PROGRAMS', autoconf/automake generates smarter Makefiles, so that the test programs are not being compiled during the normal 'make all', but only during 'make check'. Change-Id: I816689e2aeac9decbc44ba210956a929cc7a3169 --- M tests/CommonLibs/Makefile.am M tests/Transceiver52M/Makefile.am 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am index 26b49e2..e6790e6 100644 --- a/tests/CommonLibs/Makefile.am +++ b/tests/CommonLibs/Makefile.am @@ -11,7 +11,7 @@ LogTest.ok \ LogTest.err -noinst_PROGRAMS = \ +check_PROGRAMS = \ BitVectorTest \ PRBSTest \ InterthreadTest \ diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index edb812f..9fae41f 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = convolve_test.ok convolve_test_golden.h -noinst_PROGRAMS = \ +check_PROGRAMS = \ convolve_test convolve_test_SOURCES = convolve_test.c @@ -18,7 +18,7 @@ endif if DEVICE_LMS -noinst_PROGRAMS += LMSDeviceTest +check_PROGRAMS += LMSDeviceTest LMSDeviceTest_SOURCES = LMSDeviceTest.cpp LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS) LMSDeviceTest_LDADD = \ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/27788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I816689e2aeac9decbc44ba210956a929cc7a3169 Gerrit-Change-Number: 27788 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-hlr[master]: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/27783 ) Change subject: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' ...................................................................... tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' When using 'check_PROGRAMS', autoconf/automake generates smarter Makefiles, so that the test programs are not being compiled during the normal 'make all', but only during 'make check'. Change-Id: I70cf75b3cb6ae59c92248cc529546750fb0da07b --- M tests/auc/Makefile.am M tests/gsup/Makefile.am 2 files changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/auc/Makefile.am b/tests/auc/Makefile.am index 9b65d71..5ae133b 100644 --- a/tests/auc/Makefile.am +++ b/tests/auc/Makefile.am @@ -23,9 +23,7 @@ auc_ts_55_205_test_sets.err \ $(NULL) -check_PROGRAMS = auc_ts_55_205_test_sets - -noinst_PROGRAMS = auc_test +check_PROGRAMS = auc_test auc_ts_55_205_test_sets auc_test_SOURCES = \ auc_test.c \ diff --git a/tests/gsup/Makefile.am b/tests/gsup/Makefile.am index 5dbb180..9a10597 100644 --- a/tests/gsup/Makefile.am +++ b/tests/gsup/Makefile.am @@ -17,7 +17,7 @@ gsup_test.err \ $(NULL) -noinst_PROGRAMS = \ +check_PROGRAMS = \ gsup_test \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/27783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I70cf75b3cb6ae59c92248cc529546750fb0da07b Gerrit-Change-Number: 27783 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-sgsn[master]: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/27787 ) Change subject: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' ...................................................................... tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' When using 'check_PROGRAMS', autoconf/automake generates smarter Makefiles, so that the test programs are not being compiled during the normal 'make all', but only during 'make check'. Change-Id: I8118ee3d3da9bdcd0c691471ef91b95dba21004a --- M tests/gprs/Makefile.am M tests/gtphub/Makefile.am M tests/sgsn/Makefile.am M tests/slhc/Makefile.am M tests/sndcp_xid/Makefile.am M tests/v42bis/Makefile.am M tests/xid/Makefile.am 7 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/gprs/Makefile.am b/tests/gprs/Makefile.am index 902313f..f90fd6e 100644 --- a/tests/gprs/Makefile.am +++ b/tests/gprs/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = gprs_test.ok -noinst_PROGRAMS = gprs_test +check_PROGRAMS = gprs_test gprs_test_SOURCES = gprs_test.c $(top_srcdir)/src/gprs/gprs_utils.c diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am index fea01e0..6bb1a56 100644 --- a/tests/gtphub/Makefile.am +++ b/tests/gtphub/Makefile.am @@ -16,7 +16,7 @@ gtphub_test.ok \ $(NULL) -noinst_PROGRAMS = \ +check_PROGRAMS = \ gtphub_test \ $(NULL) diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index bdf941d..72a7714 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -25,7 +25,7 @@ sgsn_test.ok \ $(NULL) -noinst_PROGRAMS = \ +check_PROGRAMS = \ sgsn_test \ $(NULL) diff --git a/tests/slhc/Makefile.am b/tests/slhc/Makefile.am index b6738c2..0167f44 100644 --- a/tests/slhc/Makefile.am +++ b/tests/slhc/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = slhc_test.ok -noinst_PROGRAMS = slhc_test +check_PROGRAMS = slhc_test slhc_test_SOURCES = slhc_test.c diff --git a/tests/sndcp_xid/Makefile.am b/tests/sndcp_xid/Makefile.am index 24626b3..4513c05 100644 --- a/tests/sndcp_xid/Makefile.am +++ b/tests/sndcp_xid/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = sndcp_xid_test.ok -noinst_PROGRAMS = sndcp_xid_test +check_PROGRAMS = sndcp_xid_test sndcp_xid_test_SOURCES = sndcp_xid_test.c diff --git a/tests/v42bis/Makefile.am b/tests/v42bis/Makefile.am index 7442392..56b31f6 100644 --- a/tests/v42bis/Makefile.am +++ b/tests/v42bis/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = v42bis_test.ok -noinst_PROGRAMS = v42bis_test +check_PROGRAMS = v42bis_test v42bis_test_SOURCES = v42bis_test.c diff --git a/tests/xid/Makefile.am b/tests/xid/Makefile.am index 6f058f5..d3c205e 100644 --- a/tests/xid/Makefile.am +++ b/tests/xid/Makefile.am @@ -15,7 +15,7 @@ xid_test.ok \ $(NULL) -noinst_PROGRAMS = \ +check_PROGRAMS = \ xid_test \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/27787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8118ee3d3da9bdcd0c691471ef91b95dba21004a Gerrit-Change-Number: 27787 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-smlc[master]: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/27789 ) Change subject: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' ...................................................................... tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' When using 'check_PROGRAMS', autoconf/automake generates smarter Makefiles, so that the test programs are not being compiled during the normal 'make all', but only during 'make check'. Change-Id: I9b60429c8c3922dd97809c72ed7960ffdc059d8b --- M tests/smlc_subscr/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/smlc_subscr/Makefile.am b/tests/smlc_subscr/Makefile.am index 9ed3b59..61a601f 100644 --- a/tests/smlc_subscr/Makefile.am +++ b/tests/smlc_subscr/Makefile.am @@ -20,7 +20,7 @@ smlc_subscr_test.err \ $(NULL) -noinst_PROGRAMS = \ +check_PROGRAMS = \ smlc_subscr_test \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/27789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I9b60429c8c3922dd97809c72ed7960ffdc059d8b Gerrit-Change-Number: 27789 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022