aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.vty-tests2
-rw-r--r--configure.ac5
-rwxr-xr-xcontrib/jenkins.sh4
3 files changed, 3 insertions, 8 deletions
diff --git a/README.vty-tests b/README.vty-tests
index ba1b87cb0..0669ea8e8 100644
--- a/README.vty-tests
+++ b/README.vty-tests
@@ -4,7 +4,7 @@ To run the configuration parsing and output (VTY) test suite, first install
and pass the following configure options here:
- ./configure --enable-vty-tests --enable-external-tests
+ ./configure --enable-external-tests
The VTY tests are then included in the standard check target:
diff --git a/configure.ac b/configure.ac
index e886fa514..b89c046c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,11 +150,6 @@ AC_DEFUN([CHECK_TM_INCLUDES_TM_GMTOFF], [
CHECK_TM_INCLUDES_TM_GMTOFF
-AC_ARG_ENABLE([vty_tests],
- AC_HELP_STRING([--enable-vty-tests],
- [Include the VTY/CTRL tests in make check (deprecated)
- [default=no]]),
- [enable_ext_tests="$enableval"],[enable_ext_tests="no"])
AC_ARG_ENABLE([external_tests],
AC_HELP_STRING([--enable-external-tests],
[Include the VTY/CTRL tests in make check [default=no]]),
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index d2db0c98b..a32be1e70 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -46,12 +46,12 @@ set -x
cd "$base"
autoreconf --install --force
-./configure --enable-sanitize $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
+./configure --enable-sanitize $SMPP $MGCP $IU --enable-external-tests
$MAKE $PARALLEL_MAKE
LD_LIBRARY_PATH="$inst/lib" $MAKE check \
|| cat-testlogs.sh
LD_LIBRARY_PATH="$inst/lib" \
- DISTCHECK_CONFIGURE_FLAGS="--enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests" \
+ DISTCHECK_CONFIGURE_FLAGS="--enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-external-tests" \
$MAKE distcheck \
|| cat-testlogs.sh