build(docker): enable stabber for functional tests
Some checks failed
CI Code / Check spelling (pull_request) Successful in 22s
CI Code / Check coding style (pull_request) Successful in 34s
CI Code / Linux (debian) (pull_request) Failing after 4m6s
CI Code / Linux (arch) (pull_request) Failing after 5m22s
CI Code / Linux (ubuntu) (pull_request) Failing after 26m18s
Some checks failed
CI Code / Check spelling (pull_request) Successful in 22s
CI Code / Check coding style (pull_request) Successful in 34s
CI Code / Linux (debian) (pull_request) Failing after 4m6s
CI Code / Linux (arch) (pull_request) Failing after 5m22s
CI Code / Linux (ubuntu) (pull_request) Failing after 26m18s
- Enable stabber build from https://git.jabber.space/devs/stabber - Add tcl-expect-dev package for Debian/Ubuntu (required by libexpect) - Add expect package for Arch Linux - Fix libexpect detection in configure.ac (requires -ltcl8.6 on Debian/Ubuntu) - Remove stabber submodule, use system-installed libstabber instead - Update Makefile.am to use system libstabber paths
This commit is contained in:
@@ -300,9 +300,8 @@ tests_unittests_unittests_LDADD = -lcmocka
|
||||
TESTS += tests/functionaltests/functionaltests
|
||||
check_PROGRAMS += tests/functionaltests/functionaltests
|
||||
tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources)
|
||||
tests_functionaltests_functionaltests_CPPFLAGS = -Itests/ -I$(top_srcdir)/external/stabber
|
||||
tests_functionaltests_functionaltests_CFLAGS = $(AM_CFLAGS) -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 -I$(top_srcdir)/external/stabber
|
||||
tests_functionaltests_functionaltests_LDFLAGS = -L$(top_srcdir)/external/stabber/.libs -Wl,-rpath,$(top_srcdir)/external/stabber/.libs
|
||||
tests_functionaltests_functionaltests_CPPFLAGS = -Itests/
|
||||
tests_functionaltests_functionaltests_CFLAGS = $(AM_CFLAGS) -I/usr/include/tcl8.6 -I/usr/include/tcl8.5
|
||||
tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl8.6
|
||||
|
||||
|
||||
|
||||
@@ -375,8 +375,12 @@ AM_CONDITIONAL([HAVE_STABBER], [false])
|
||||
AC_CHECK_LIB([stabber], [stbbr_start], [AM_CONDITIONAL([HAVE_STABBER], [true])],
|
||||
[AC_MSG_NOTICE([libstabber not found, will not be able to run functional tests])])
|
||||
AM_CONDITIONAL([HAVE_EXPECT], [false])
|
||||
dnl libexpect on Debian/Ubuntu requires -ltcl8.6 for linking
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS -ltcl8.6"
|
||||
AC_CHECK_LIB([expect], [exp_expectl], [AM_CONDITIONAL([HAVE_EXPECT], [true])],
|
||||
[AC_MSG_NOTICE([libexpect not found, will not be able to run functional tests])])
|
||||
LIBS="$saved_LIBS"
|
||||
|
||||
## Default parameters
|
||||
AM_CFLAGS="$AM_CFLAGS -Wall -Wno-deprecated-declarations -std=gnu99 -ggdb3"
|
||||
|
||||
1
external/stabber
vendored
1
external/stabber
vendored
Submodule external/stabber deleted from fdb615a213
Reference in New Issue
Block a user