aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Only run functional tests when libstabber available

Browse Source
This commit is contained in:
James Booth 2015-07-03 15:14:34 +01:00
parent b98e119c86
commit 252c7c2e06
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -153,14 +153,19 @@ if INCLUDE_GIT_VERSION
BUILT_SOURCES = $(git_include) BUILT_SOURCES = $(git_include)
endif endif
TESTS = tests/unittests/unittests tests/functionaltests/functionaltests TESTS = tests/unittests/unittests
check_PROGRAMS = tests/unittests/unittests tests/functionaltests/functionaltests check_PROGRAMS = tests/unittests/unittests
tests_unittests_unittests_SOURCES = $(unittest_sources) tests_unittests_unittests_SOURCES = $(unittest_sources)
tests_unittests_unittests_CFLAGS = -w tests_unittests_unittests_CFLAGS = -w
tests_unittests_unittests_LDADD = -lcmocka 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_SOURCES = $(functionaltest_sources)
tests_functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 tests_functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5
tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl
endif
man_MANS = $(man_sources) man_MANS = $(man_sources)

3
configure.ac
View File

@ -241,7 +241,8 @@ AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL")
PKG_CHECK_MODULES([cmocka], [cmocka], [], PKG_CHECK_MODULES([cmocka], [cmocka], [],
[AC_MSG_NOTICE([cmocka is not found, will not be able to run tests])]) [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])]) [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 ### Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw