Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4e99252
Check for atf-c.h to build regression tests
Baptiste Daroussin committed 12 years ago
commit 4e99252c086fd6352cfe9e52a8114d9e7b847da7
parent 5a7f24c
8 files changed +99 -56
modified Makefile.am
@@ -369,5 +369,5 @@ external/libelf/libelf_msize.c:
	@echo "    M4    " $@;

	@m4 -D SRCDIR=external/libelf $(top_srcdir)/external/libelf/elf_types.m4 $(top_srcdir)/external/libelf/libelf_msize.m4 > $@
- 
regression-test:check
+ 
regression-test: @HAVE_TEST@

	@echo "ATF/KYUA has change our testing framework is not compatible for now"
modified Makefile.in
@@ -478,6 +478,7 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@

GIT_HEAD = @GIT_HEAD@

GREP = @GREP@
+ 
HAVE_TEST = @HAVE_TEST@

INSTALL = @INSTALL@

INSTALL_DATA = @INSTALL_DATA@

INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -4350,7 +4351,7 @@ external/libelf/libelf_msize.c:
	@echo "    M4    " $@;

	@m4 -D SRCDIR=external/libelf $(top_srcdir)/external/libelf/elf_types.m4 $(top_srcdir)/external/libelf/libelf_msize.m4 > $@
- 
regression-test:check
+ 
regression-test: @HAVE_TEST@

	@echo "ATF/KYUA has change our testing framework is not compatible for now"



# Tell versions [3.59,3.63) of GNU make to not export all variables.
modified autom4te.cache/output.0
@@ -636,6 +636,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE

LTLIBOBJS

LIB@&t@OBJS
+ 
HAVE_TEST

LIBELF_INCLUDE

LIBELF_BUNDLED

LIBELF_LIB
@@ -11560,6 +11561,16 @@ fi
+ 
ac_fn_c_check_header_mongrel "$LINENO" "atf-ccc.h" "ac_cv_header_atf_ccc_h" "$ac_includes_default"
+ 
if test "x$ac_cv_header_atf_ccc_h" = xyes; then :
+
+ 
	HAVE_TEST="check"
+
+ 
fi
+
+
+
+
modified autom4te.cache/output.1
@@ -636,6 +636,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE

LTLIBOBJS

LIB@&t@OBJS
+ 
HAVE_TEST

LIBELF_INCLUDE

LIBELF_BUNDLED

LIBELF_LIB
@@ -11556,6 +11557,16 @@ fi
+ 
ac_fn_c_check_header_mongrel "$LINENO" "atf-ccc.h" "ac_cv_header_atf_ccc_h" "$ac_includes_default"
+ 
if test "x$ac_cv_header_atf_ccc_h" = xyes; then :
+
+ 
	HAVE_TEST="check"
+
+ 
fi
+
+
+
+
modified autom4te.cache/traces.0
@@ -2587,18 +2587,19 @@ m4trace:configure.ac:29: -1- m4_pattern_allow([^GIT_HEAD$])
m4trace:configure.ac:30: -1- m4_pattern_allow([^PKG_API$])

m4trace:configure.ac:31: -1- m4_pattern_allow([^HAVE_GELF_H$])

m4trace:configure.ac:31: -1- m4_pattern_allow([^HAVE_LIBELF$])
- 
m4trace:configure.ac:43: -1- m4_pattern_allow([^LIBELF_LIB$])
- 
m4trace:configure.ac:44: -1- m4_pattern_allow([^LIBELF_BUNDLED$])
- 
m4trace:configure.ac:45: -1- m4_pattern_allow([^LIBELF_INCLUDE$])
- 
m4trace:configure.ac:50: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+ 
m4trace:configure.ac:47: -1- m4_pattern_allow([^LIBELF_LIB$])
+ 
m4trace:configure.ac:48: -1- m4_pattern_allow([^LIBELF_BUNDLED$])
+ 
m4trace:configure.ac:49: -1- m4_pattern_allow([^LIBELF_INCLUDE$])
+ 
m4trace:configure.ac:50: -1- m4_pattern_allow([^HAVE_TEST$])
+ 
m4trace:configure.ac:55: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.

You should run autoupdate.], [])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^LTLIBOBJS$])
- 
m4trace:configure.ac:50: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
- 
m4trace:configure.ac:50: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
- 
m4trace:configure.ac:50: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
- 
m4trace:configure.ac:50: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
- 
m4trace:configure.ac:50: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
- 
m4trace:configure.ac:50: -1- _LT_PROG_LTMAIN
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^LTLIBOBJS$])
+ 
m4trace:configure.ac:55: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+ 
m4trace:configure.ac:55: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+ 
m4trace:configure.ac:55: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+ 
m4trace:configure.ac:55: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+ 
m4trace:configure.ac:55: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
m4trace:configure.ac:55: -1- _LT_PROG_LTMAIN
modified autom4te.cache/traces.1
@@ -510,18 +510,21 @@ m4trace:configure.ac:31: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBELF])
m4trace:configure.ac:31: -1- m4_pattern_allow([^HAVE_LIBELF$])

m4trace:configure.ac:31: -1- AH_OUTPUT([HAVE_LIBELF], [/* Define to 1 if you have the \'elf\' library (-lelf). */

@%:@undef HAVE_LIBELF])
- 
m4trace:configure.ac:43: -1- AC_SUBST([LIBELF_LIB])
- 
m4trace:configure.ac:43: -1- AC_SUBST_TRACE([LIBELF_LIB])
- 
m4trace:configure.ac:43: -1- m4_pattern_allow([^LIBELF_LIB$])
- 
m4trace:configure.ac:44: -1- AC_SUBST([LIBELF_BUNDLED])
- 
m4trace:configure.ac:44: -1- AC_SUBST_TRACE([LIBELF_BUNDLED])
- 
m4trace:configure.ac:44: -1- m4_pattern_allow([^LIBELF_BUNDLED$])
- 
m4trace:configure.ac:45: -1- AC_SUBST([LIBELF_INCLUDE])
- 
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([LIBELF_INCLUDE])
- 
m4trace:configure.ac:45: -1- m4_pattern_allow([^LIBELF_INCLUDE$])
- 
m4trace:configure.ac:47: -1- AC_CONFIG_FILES([Makefile])
- 
m4trace:configure.ac:48: -1- AC_CONFIG_HEADERS([pkg_config.h])
- 
m4trace:configure.ac:50: -1- AC_CONFIG_FILES([
+ 
m4trace:configure.ac:47: -1- AC_SUBST([LIBELF_LIB])
+ 
m4trace:configure.ac:47: -1- AC_SUBST_TRACE([LIBELF_LIB])
+ 
m4trace:configure.ac:47: -1- m4_pattern_allow([^LIBELF_LIB$])
+ 
m4trace:configure.ac:48: -1- AC_SUBST([LIBELF_BUNDLED])
+ 
m4trace:configure.ac:48: -1- AC_SUBST_TRACE([LIBELF_BUNDLED])
+ 
m4trace:configure.ac:48: -1- m4_pattern_allow([^LIBELF_BUNDLED$])
+ 
m4trace:configure.ac:49: -1- AC_SUBST([LIBELF_INCLUDE])
+ 
m4trace:configure.ac:49: -1- AC_SUBST_TRACE([LIBELF_INCLUDE])
+ 
m4trace:configure.ac:49: -1- m4_pattern_allow([^LIBELF_INCLUDE$])
+ 
m4trace:configure.ac:50: -1- AC_SUBST([HAVE_TEST])
+ 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([HAVE_TEST])
+ 
m4trace:configure.ac:50: -1- m4_pattern_allow([^HAVE_TEST$])
+ 
m4trace:configure.ac:52: -1- AC_CONFIG_FILES([Makefile])
+ 
m4trace:configure.ac:53: -1- AC_CONFIG_HEADERS([pkg_config.h])
+ 
m4trace:configure.ac:55: -1- AC_CONFIG_FILES([

	   libpkg/pkg.h

	   libpkg/pkg.pc

	   scripts/periodic/400.status-pkg
@@ -533,32 +536,32 @@ m4trace:configure.ac:50: -1- AC_CONFIG_FILES([
	   scripts/completion/_pkg.bash

	   scripts/completion/_pkg.zsh

])
- 
m4trace:configure.ac:50: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+ 
m4trace:configure.ac:55: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.

You should run autoupdate.], [])
- 
m4trace:configure.ac:50: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$])
- 
m4trace:configure.ac:50: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([LTLIBOBJS])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^LTLIBOBJS$])
- 
m4trace:configure.ac:50: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
- 
m4trace:configure.ac:50: -1- AC_SUBST([am__EXEEXT_TRUE])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
- 
m4trace:configure.ac:50: -1- AC_SUBST([am__EXEEXT_FALSE])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
- 
m4trace:configure.ac:50: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
- 
m4trace:configure.ac:50: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
- 
m4trace:configure.ac:50: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([top_builddir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([top_build_prefix])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([srcdir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([abs_srcdir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([top_srcdir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([abs_top_srcdir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([builddir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([abs_builddir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([abs_top_builddir])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([INSTALL])
- 
m4trace:configure.ac:50: -1- AC_SUBST_TRACE([MKDIR_P])
- 
m4trace:configure.ac:50: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+ 
m4trace:configure.ac:55: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+ 
m4trace:configure.ac:55: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([LTLIBOBJS])
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^LTLIBOBJS$])
+ 
m4trace:configure.ac:55: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+ 
m4trace:configure.ac:55: -1- AC_SUBST([am__EXEEXT_TRUE])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+ 
m4trace:configure.ac:55: -1- AC_SUBST([am__EXEEXT_FALSE])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+ 
m4trace:configure.ac:55: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+ 
m4trace:configure.ac:55: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+ 
m4trace:configure.ac:55: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([top_builddir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([top_build_prefix])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([srcdir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([abs_srcdir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([top_srcdir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([abs_top_srcdir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([builddir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([abs_builddir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([abs_top_builddir])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([INSTALL])
+ 
m4trace:configure.ac:55: -1- AC_SUBST_TRACE([MKDIR_P])
+ 
m4trace:configure.ac:55: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
modified configure
@@ -636,6 +636,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE

LTLIBOBJS

LIBOBJS
+ 
HAVE_TEST

LIBELF_INCLUDE

LIBELF_BUNDLED

LIBELF_LIB
@@ -11556,6 +11557,16 @@ fi
+ 
ac_fn_c_check_header_mongrel "$LINENO" "atf-ccc.h" "ac_cv_header_atf_ccc_h" "$ac_includes_default"
+ 
if test "x$ac_cv_header_atf_ccc_h" = xyes; then :
+
+ 
	HAVE_TEST="check"
+
+ 
fi
+
+
+
+
modified configure.ac
@@ -40,9 +40,14 @@ AC_CHECK_HEADER([gelf.h], [
    LIBELF_INCLUDE="-I\$(top_srcdir)/external/libelf"

])
+ 
AC_CHECK_HEADER([atf-ccc.h], [
+ 
	HAVE_TEST="check"
+ 
])
+ 


AC_SUBST([LIBELF_LIB])

AC_SUBST([LIBELF_BUNDLED])

AC_SUBST([LIBELF_INCLUDE])
+ 
AC_SUBST([HAVE_TEST])



AC_CONFIG_FILES(Makefile)

AC_CONFIG_HEADERS(pkg_config.h)