tests: Use atlocal/atlocal.in to enable/disable the NAT test

Kill the hacking, use atlocal to remember if the NAT test should
be enabled and then skip the test (exit with 77).
changes/88/3188/1
Holger Hans Peter Freyther 11 years ago
parent 03ff1c8477
commit 93ef33edb6
  1. 1
      openbsc/.gitignore
  2. 2
      openbsc/configure.ac
  3. 6
      openbsc/tests/Makefile.am
  4. 1
      openbsc/tests/atlocal.in
  5. 4
      openbsc/tests/testsuite.at

@ -54,6 +54,7 @@ tests/timer/timer_test
tests/gprs/gprs_test
tests/atconfig
tests/atlocal
tests/package.m4
tests/testsuite
tests/testsuite.log

@ -29,6 +29,7 @@ AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Require
osmo_ac_build_nat="no"
])
AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes")
AC_SUBST(osmo_ac_build_nat)
AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])],
[
@ -106,6 +107,7 @@ AC_OUTPUT(
src/libgb/Makefile
src/gprs/Makefile
tests/Makefile
tests/atlocal
tests/debug/Makefile
tests/gsm0408/Makefile
tests/db/Makefile

@ -2,14 +2,11 @@ SUBDIRS = debug gsm0408 db channel mgcp gprs
if BUILD_NAT
SUBDIRS += bsc-nat
ENABLE_NAT_TEST = echo 'm4_define([ENABLE_NAT_TEST], [1])';
else
ENABLE_NAT_TEST = echo '';
endif
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.log
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
:;{ \
echo '# Signature of the current package.' && \
echo 'm4_define([AT_PACKAGE_NAME],' && \
@ -24,7 +21,6 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.log
echo ' [$(PACKAGE_BUGREPORT)])'; \
echo 'm4_define([AT_PACKAGE_URL],' && \
echo ' [$(PACKAGE_URL)])'; \
$(ENABLE_NAT_TEST) \
} >'$(srcdir)/package.m4'
EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE)

@ -0,0 +1 @@
enable_nat_test='@osmo_ac_build_nat@'

@ -31,9 +31,9 @@ cat $abs_srcdir/gprs/gprs_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/gprs/gprs_test], [], [expout], [ignore])
AT_CLEANUP
m4_ifdef([ENABLE_NAT_TEST],[
AT_SETUP([bsc-nat])
AT_KEYWORDS([bsc-nat])
AT_CHECK([test "$enable_nat_test" != no || exit 77])
cat $abs_srcdir/bsc-nat/bsc_nat_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/bsc-nat/bsc_nat_test], [], [expout], [ignore])
AT_CLEANUP])
AT_CLEANUP

Loading…
Cancel
Save