Max has submitted this change and it was merged. Change subject: Fix repo split aftermath ......................................................................
Fix repo split aftermath * remove checks for non-existent tests * always enable bsc and nat-trie tests because both are built unconditionally * enable gsm0408 test which was removed by mistake * adjust gsm0408 test output to remove SMS-related results Change-Id: I73ad079a6333ba56e73b7c4d1d0e9c8255c2a03b Related: OS#2257 --- M tests/atlocal.in M tests/testsuite.at 2 files changed, 6 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/atlocal.in b/tests/atlocal.in index 362bfa9..e69de29 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,7 +0,0 @@ -enable_nat_test='@osmo_ac_build_nat@' -enable_smpp_test='@osmo_ac_build_smpp@' -enable_bsc_test='@osmo_ac_build_bsc@' -enable_mgcp_transcoding_test='@osmo_ac_mgcp_transcoding@' -enable_sgsn_test='@found_libgtp_and_libcares@' -enable_oap_test='@found_libgtp_and_libcares@' -enable_gtphub_test='@found_libgtp_and_libcares@' diff --git a/tests/testsuite.at b/tests/testsuite.at index a412f7c..50f68e1 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,6 +1,12 @@ AT_INIT AT_BANNER([Regression tests.]) +AT_SETUP([gsm0408]) +AT_KEYWORDS([gsm0408]) +cat $abs_srcdir/gsm0408/gsm0408_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/gsm0408/gsm0408_test], [], [expout], [ignore]) +AT_CLEANUP + AT_SETUP([bsc_subscr]) AT_KEYWORDS([bsc_subscr]) cat $abs_srcdir/subscr/bsc_subscr_test.ok > expout @@ -16,7 +22,6 @@ AT_SETUP([bsc-nat-trie]) AT_KEYWORDS([bsc-nat-trie]) -AT_CHECK([test "$enable_nat_test" != no || exit 77]) cp $abs_srcdir/bsc-nat-trie/prefixes.csv . cat $abs_srcdir/bsc-nat-trie/bsc_nat_trie_test.ok > expout AT_CHECK([$abs_top_builddir/tests/bsc-nat-trie/bsc_nat_trie_test], [], [expout], [ignore]) @@ -30,7 +35,6 @@ AT_SETUP([bsc]) AT_KEYWORDS([bsc]) -AT_CHECK([test "$enable_bsc_test" != no || exit 77]) cat $abs_srcdir/bsc/bsc_test.ok > expout AT_CHECK([$abs_top_builddir/tests/bsc/bsc_test], [], [expout], [ignore]) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/4108 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73ad079a6333ba56e73b7c4d1d0e9c8255c2a03b Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Max <msur...@sysmocom.de> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msur...@sysmocom.de> Gerrit-Reviewer: Neels Hofmeyr <nhofm...@sysmocom.de>