Revision: 14766
Author: adrian.chadd
Date: Sun Aug 29 00:41:59 2010
Log: Merge the ATF build into the autoconf/automake setup.
--enable-atf will enable building the ATF test-suite.
--enable-atf=<prefix> allows for ATF to live outside of /usr -
eg, it lives in /usr/local/atf-0.10 on my laptops.
This doesn't (yet) include something to run the test-suite;
I'll do that next.
http://code.google.com/p/lusca-cache/source/detail?r=14766
Deleted:
/branches/LUSCA_HEAD/test-suite/atf/Makefile
/branches/LUSCA_HEAD/test-suite/atf/Makefile.inc
Modified:
/branches/LUSCA_HEAD/Makefile.am
/branches/LUSCA_HEAD/configure.in
=======================================
--- /branches/LUSCA_HEAD/test-suite/atf/Makefile Thu May 27 05:22:23 2010
+++ /dev/null
@@ -1,70 +0,0 @@
-
-include ./Makefile.inc
-
-BASEDIR=../..
-
-LDADD=-L$(BASEDIR)/libcore \
- -L$(BASEDIR)/lib \
- -L$(BASEDIR)/libcore \
- -L$(BASEDIR)/libsqdebug \
- -L$(BASEDIR)/libmem \
- -L$(BASEDIR)/libcb \
- -L$(BASEDIR)/libmime \
- -L$(BASEDIR)/libhelper \
- -L$(BASEDIR)/libstmem \
- -L$(BASEDIR)/libiapp \
- -L$(BASEDIR)/libhttp \
- -L$(BASEDIR)/libsqurl \
- -L$(BASEDIR)/libstat \
- -L$(BASEDIR)/libsqdns \
- -L$(BASEDIR)/libsqident \
- -L$(BASEDIR)/libsqinet \
- -L$(BASEDIR)/libsqname \
- -L$(BASEDIR)/libasyncio \
- -L$(BASEDIR)/libsqtlv \
- -L$(BASEDIR)/libsqstore \
- -lsqstore \
- -lsqtlv \
- -lasyncio \
- -lstmem \
- -lsqdns \
- -lsqident \
- -lsqinet \
- -lsqdebug \
- -lsqname \
- -lcb \
- -lhelper \
- -lmime \
- -liapp \
- -lhttp \
- -lsqurl \
- -lmem \
- -lcore \
- -lstat \
- -lmiscutil \
- -lpthread -lm \
- -latf-c
-
-LDFLAGS=$(LDADD) -L$(ATF_LIBDIR)
-CFLAGS=-O -g -I$(BASEDIR) -I$(ATF_INCLUDEDIR)
-
-all: libhttp lib_Vector libsqurl url_benchmark
-
-libhttp: libhttp.o core.o
- $(CC) core.o libhttp.o -o libhttp $(LDFLAGS)
-
-lib_Vector: lib_Vector.o core.o
- $(CC) core.o lib_Vector.o -o lib_Vector $(LDFLAGS)
-
-libsqurl: libsqurl.o core.o
- $(CC) core.o libsqurl.o -o libsqurl $(LDFLAGS)
-
-url_benchmark: url_benchmark.o core.o
- $(CC) core.o url_benchmark.o -o url_benchmark $(LDFLAGS)
-
-check: libhttp lib_Vector libsqurl
- @env PATH=$$PATH:$(ATF_BINDIR) $(ATF_BINDIR)/atf-run |
$(ATF_BINDIR)/atf-report
-
-clean:
- rm -f libhttp lib_Vector libsqurl url_benchmark *.o
-
=======================================
--- /branches/LUSCA_HEAD/test-suite/atf/Makefile.inc Thu May 13 02:29:57
2010
+++ /dev/null
@@ -1,3 +0,0 @@
-ATF_INCLUDEDIR=/usr/local/atf-0.8/include
-ATF_LIBDIR=/usr/local/atf-0.8/lib
-ATF_BINDIR=/usr/local/atf-0.8/bin
=======================================
--- /branches/LUSCA_HEAD/Makefile.am Sun May 23 00:33:46 2010
+++ /branches/LUSCA_HEAD/Makefile.am Sun Aug 29 00:41:59 2010
@@ -4,8 +4,8 @@
#
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5
-DIST_SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libsqftp
libsqurl libhttp libsqdns libsqident libsqinet libhelper libmime libsqdebug
libstmem libasyncio libsqtlv libsqstore snmplib scripts src icons errors
contrib doc helpers tools app
-SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libsqftp
libsqurl libhttp libsqdns libsqident libsqinet libhelper libmime libsqdebug
libstmem libasyncio libsqtlv libsqstore @makesnmplib@ scripts src icons
errors doc helpers tools app
+DIST_SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libsqftp
libsqurl libhttp libsqdns libsqident libsqinet libhelper libmime libsqdebug
libstmem libasyncio libsqtlv libsqstore snmplib scripts src icons errors
contrib doc helpers tools app test-suite
+SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libsqftp
libsqurl libhttp libsqdns libsqident libsqinet libhelper libmime libsqdebug
libstmem libasyncio libsqtlv libsqstore @makesnmplib@ scripts src icons
errors doc helpers tools app test-suite
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
DEFAULT_PINGER = $(libexecdir)/`echo pinger |
sed '$(transform);s/$$/$(EXEEXT)/'`
=======================================
--- /branches/LUSCA_HEAD/configure.in Sun Aug 29 00:00:29 2010
+++ /branches/LUSCA_HEAD/configure.in Sun Aug 29 00:41:59 2010
@@ -735,6 +735,32 @@
esac
])
+dnl ATF may be installed in a different directory
+ATF_PREFIX=""
+AM_CONDITIONAL(ENABLE_ATF, false)
+AC_ARG_ENABLE(atf,
+[ --enable-atf[=prefix]
+ Enable compilation of test cases using the NetBSD
+ testing framework.],
+[
+ case "$enable_atf" in
+ yes)
+ AM_CONDITIONAL(ENABLE_ATF, true)
+ USE_ATF=1
+ ATF_PREFIX="/usr"
+ ;;
+ no)
+ USE ATF=0
+ ;;
+ *)
+ AM_CONDITIONAL(ENABLE_ATF, true)
+ USE_ATF=1
+ ATF_PREFIX="$enable_atf"
+ ;;
+ esac
+])
+AC_SUBST(ATF_PREFIX)
+
dnl User may specify OpenSSL is needed from a non-standard location
AC_ARG_WITH(openssl,
[ --with-openssl[=prefix]
@@ -3372,5 +3398,7 @@
helpers/external_acl/session/Makefile \
helpers/external_acl/unix_group/Makefile \
helpers/external_acl/wbinfo_group/Makefile \
+ test-suite/Makefile \
+ test-suite/atf/Makefile \
tools/Makefile \
])
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
