Run tests with ‘make check’
The configure --enable-tests flag is no longer needed because check_PROGRAMS are not built until you run ‘make check’. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
committed by
Keith Winstein
parent
a611ef5821
commit
7b9e548aa0
@@ -134,12 +134,6 @@ AC_ARG_ENABLE([server],
|
|||||||
[build_server="yes"])
|
[build_server="yes"])
|
||||||
AM_CONDITIONAL([BUILD_SERVER], [test x"$build_server" != xno])
|
AM_CONDITIONAL([BUILD_SERVER], [test x"$build_server" != xno])
|
||||||
|
|
||||||
AC_ARG_ENABLE([tests],
|
|
||||||
[AS_HELP_STRING([--enable-tests], [Build tests @<:@no@:>@])],
|
|
||||||
[build_tests="$enableval"],
|
|
||||||
[build_tests="no"])
|
|
||||||
AM_CONDITIONAL([BUILD_TESTS], [test x"$build_tests" != xno])
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([examples],
|
AC_ARG_ENABLE([examples],
|
||||||
[AS_HELP_STRING([--enable-examples], [Build the miscellaneous programs in src/examples @<:@no@:>@])],
|
[AS_HELP_STRING([--enable-examples], [Build the miscellaneous programs in src/examples @<:@no@:>@])],
|
||||||
[build_examples="$enableval"],
|
[build_examples="$enableval"],
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
|
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
|
||||||
AM_LDFLAGS = $(HARDEN_LDFLAGS)
|
AM_LDFLAGS = $(HARDEN_LDFLAGS)
|
||||||
|
|
||||||
if BUILD_TESTS
|
check_PROGRAMS = ocb-aes encrypt-decrypt
|
||||||
noinst_PROGRAMS = ocb-aes encrypt-decrypt
|
TESTS = ocb-aes encrypt-decrypt
|
||||||
endif
|
|
||||||
|
|
||||||
ocb_aes_SOURCES = ocb-aes.cc test_utils.cc test_utils.h
|
ocb_aes_SOURCES = ocb-aes.cc test_utils.cc test_utils.h
|
||||||
ocb_aes_CPPFLAGS = -I$(srcdir)/../crypto -I$(srcdir)/../util
|
ocb_aes_CPPFLAGS = -I$(srcdir)/../crypto -I$(srcdir)/../util
|
||||||
|
|||||||
Reference in New Issue
Block a user