From 252c7c2e065e141dc9c44d76a2c4d4b9b2f488ca Mon Sep 17 00:00:00 2001 From: James Booth Date: Fri, 3 Jul 2015 15:14:34 +0100 Subject: Only run functional tests when libstabber available --- Makefile.am | 9 +++++++-- configure.ac | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index bcae2923..6a6e9217 100644 --- a/Makefile.am +++ b/Makefile.am @@ -153,14 +153,19 @@ if INCLUDE_GIT_VERSION BUILT_SOURCES = $(git_include) endif -TESTS = tests/unittests/unittests tests/functionaltests/functionaltests -check_PROGRAMS = tests/unittests/unittests tests/functionaltests/functionaltests +TESTS = tests/unittests/unittests +check_PROGRAMS = tests/unittests/unittests tests_unittests_unittests_SOURCES = $(unittest_sources) tests_unittests_unittests_CFLAGS = -w tests_unittests_unittests_LDADD = -lcmocka + +if HAVE_STABBER +TESTS += tests/functionaltests/functionaltests +check_PROGRAMS += tests/functionaltests/functionaltests tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources) tests_functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl +endif man_MANS = $(man_sources) diff --git a/configure.ac b/configure.ac index 1bf05a92..ffb35a2b 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,8 @@ AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL") PKG_CHECK_MODULES([cmocka], [cmocka], [], [AC_MSG_NOTICE([cmocka is not found, will not be able to run tests])]) -AC_CHECK_LIB([stabber], [stbbr_start], [LIBS="$LIBS"], +AM_CONDITIONAL([HAVE_STABBER], [false]) +AC_CHECK_LIB([stabber], [stbbr_start], [AM_CONDITIONAL([HAVE_STABBER], [true])], [AC_MSG_NOTICE([stabber not found, will not be able to run functional tests])]) ### Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw -- cgit 1.4.1-2-gfad0