null+****@clear*****
null+****@clear*****
2010年 8月 20日 (金) 12:11:44 JST
Kouhei Sutou 2010-08-20 03:11:44 +0000 (Fri, 20 Aug 2010)
New Revision: 96d0a7ea8f22addf18127f2fbc21f955526a7b67
Log:
do nothing with 'make check' on unit test unavailable environment.
Modified files:
configure.ac
test/unit/Makefile.am
Modified: configure.ac (+7 -3)
===================================================================
--- configure.ac 2010-08-19 15:17:06 +0000 (0905230)
+++ configure.ac 2010-08-20 03:11:44 +0000 (082e4f7)
@@ -378,8 +378,8 @@ AC_CHECK_GCUTTER(>= $REQUIRED_MINIMUM_CUTTER_VERSION)
],
[ac_cv_use_cutter="no"])
-AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])
-if test "$ac_cv_use_cutter" != "no"; then
+AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" = "yes"])
+if test "$ac_cv_use_cutter" = "yes"; then
AC_DEFINE(WITH_CUTTER, 1, [Define to 1 if you use Cutter])
ac_cv_have_libmemcached=no
@@ -387,7 +387,7 @@ if test "$ac_cv_use_cutter" != "no"; then
[AC_CHECK_LIB(memcached, memcached_increment_with_initial,
[ac_cv_have_libmemcached=yes])])
AM_CONDITIONAL([WITH_LIBMEMCACHED],
- [test "$ac_cv_have_libmemcached" != "no"])
+ [test "$ac_cv_have_libmemcached" = "yes"])
if test "$ac_cv_have_libmemcached" = "yes"; then
AC_DEFINE(WITH_LIBMEMCACHED, 1, [Define to 1 if you use libmemcached])
fi
@@ -453,6 +453,10 @@ fi
AC_SUBST(RUBY)
AM_CONDITIONAL([WITH_RUBY], [test "$ac_cv_ruby_available" = "yes"])
+AM_CONDITIONAL([WITH_UNIT_TEST],
+ [test "$ac_cv_use_cutter" = "yes" -o \
+ "$ac_cv_ruby_available" = "yes"])
+
# libedit
AC_ARG_WITH(libedit,
[AS_HELP_STRING([--disable-libedit],
Modified: test/unit/Makefile.am (+2 -0)
===================================================================
--- test/unit/Makefile.am 2010-08-19 15:17:06 +0000 (8c97cfb)
+++ test/unit/Makefile.am 2010-08-20 03:11:44 +0000 (42755b7)
@@ -8,7 +8,9 @@ SUBDIRS = \
gqtp \
story
+if WITH_UNIT_TEST
TESTS = run-test.sh
+endif
TESTS_ENVIRONMENT = \
NO_MAKE=yes \
BUILD_DIR="$(builddir)" \