From c302eca2c69de664dc8ac53a4577eeffe5daa5ca Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 11 Sep 2012 11:49:35 +0200 Subject: tests: Make the gb test work with srcdir != builddir * Disable color and printing the filename of the stderr log target, update the results * Add the .ok, .err and .sh files to the extra_dist * Execute the shell script from the source directory --- tests/Makefile.am | 3 +- tests/gb/bssgp_fc_test.c | 3 ++ tests/gb/bssgp_fc_tests.err | 101 ++++++++++++++++++++++---------------------- tests/testsuite.at | 2 +- 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b489b3b2..1d1491ed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -71,7 +71,8 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ smscb/smscb_test.ok bits/bitrev_test.ok a5/a5_test.ok \ conv/conv_test.ok auth/milenage_test.ok \ lapd/lapd_test.ok gsm0408/gsm0408_test.ok \ - gsm0808/gsm0808_test.ok \ + gsm0808/gsm0808_test.ok gb/bssgp_fc_tests.err \ + gb/bssgp_fc_tests.ok gb/bssgp_fc_tests.sh \ msgfile/msgfile_test.ok msgfile/msgconfig.cfg TESTSUITE = $(srcdir)/testsuite diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c index c5e864d4..f74be300 100644 --- a/tests/gb/bssgp_fc_test.c +++ b/tests/gb/bssgp_fc_test.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -121,6 +122,8 @@ int main(int argc, char **argv) }; osmo_init_logging(&info); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_filename(osmo_stderr_target, 0); while ((c = getopt_long(argc, argv, "s:r:d:l:c:", long_options, NULL)) != -1) { diff --git a/tests/gb/bssgp_fc_tests.err b/tests/gb/bssgp_fc_tests.err index ae5d6f66..2f285af8 100644 --- a/tests/gb/bssgp_fc_tests.err +++ b/tests/gb/bssgp_fc_tests.err @@ -1,51 +1,50 @@ -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:699 Single PDU (size=1000) is larger than maximum bucket size (100)! -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes -<0000> gprs_bssgp.c:556 BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes - \ No newline at end of file +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +Single PDU (size=1000) is larger than maximum bucket size (100)! +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes +BSSGP-FC: fc_timer_cb() but still not able to send PDU of 10 bytes diff --git a/tests/testsuite.at b/tests/testsuite.at index dd22c323..360f846f 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -13,7 +13,7 @@ AT_SETUP([bssgp-fc]) AT_KEYWORDS([bssgp-fc]) cat $abs_srcdir/gb/bssgp_fc_tests.ok > expout cat $abs_srcdir/gb/bssgp_fc_tests.err > experr -AT_CHECK([$abs_top_builddir/tests/gb/bssgp_fc_tests.sh $abs_top_builddir/tests/gb], [], [expout], [experr]) +AT_CHECK([$abs_top_srcdir/tests/gb/bssgp_fc_tests.sh $abs_top_builddir/tests/gb], [], [expout], [experr]) AT_CLEANUP AT_SETUP([bits]) -- cgit v1.2.3