# Version: $Id$
#
-$(if $(wildcard Make.inc),,$(error Missing 'Make.inc' Run './configure [options]' and retry"))
+$(if $(wildcard Make.inc),,$(error Missing 'Make.inc' Run './configure [options]' and retry))
include Make.inc
# And over-ride all of the other magic.
include scripts/boiler.mk
-test: build.raddb ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient
+#
+# To work around OpenSSL issues with travis.
+#
+.PHONY:
+raddb/test.conf:
+ @echo 'security {' >> $@
+ @echo ' allow_vulnerable_openssl = yes' >> $@
+ @echo '}' >> $@
+ @echo '$$INCLUDE radiusd.conf' >> $@
+
+#
+# Run "radiusd -C", looking for errors.
+#
+# Only redirect STDOUT, which should contain details of why the test failed.
+# Don't molest STDERR as this may be used to receive output from a debugger.
+$(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd | build.raddb
@$(MAKE) -C raddb/certs
- @./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCdM ./raddb -n debug -D ./share
+ @printf "radiusd -C... "
+ @if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -D ./share -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
+ @rm -f raddb/test.conf; \
+ cat $(BUILD_DIR)/tests/radiusd.config.log; \
+ echo "fail"; \
+ exit 1; \
+ fi
+ @rm -f raddb/test.conf
+ @echo "ok"
+ @touch $@
+
+test: ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.keywords $(BUILD_DIR)/tests/radiusd-c | build.raddb
@$(MAKE) -C src/tests tests
# Tests specifically for Travis. We do a LOT more than just
# the above tests
ifneq "$(findstring travis,${prefix})" ""
-travis-test: test
+travis-test: raddb/test.conf test
+ @./build/make/jlibtool --mode=execute ./build/bin/radiusd -xxxv -n test
+ @rm -f raddb/test.conf
@$(MAKE) install
+ @perl -p -i -e 's/allow_vulnerable_openssl = no/allow_vulnerable_openssl = yes/' ${raddbdir}/radiusd.conf
+ @${sbindir}/radiusd -XC
@$(MAKE) deb
endif
#
ifeq "$(MAKECMDGOALS)" "reconfig"
-CONFIGURE_IN_FILES := $(shell find . -name configure.ac -print)
-CONFIGURE_FILES := $(patsubst %.in,%,$(CONFIGURE_IN_FILES))
+CONFIGURE_AC_FILES := $(shell find . -name configure.ac -print)
+CONFIGURE_FILES := $(patsubst %.ac,%,$(CONFIGURE_AC_FILES))
#
# The GNU tools make autoconf=="missing autoconf", which then returns
src/%all.mk: src/%all.mk.in src/%configure
@echo CONFIGURE $(dir $@)
+ @rm -f ./config.cache $(dir $<)/config.cache
@cd $(dir $<) && ./configure $(CONFIGURE_ARGS)
endif
#
.PHONY: certs
certs:
- @cd raddb/certs && $(MAKE)
+ @$(MAKE) -C raddb/certs
######################################################################
#
#
######################################################################
freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz: .git
- git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ stable | gzip > $@
+ git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v3.0.x | gzip > $@
freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz
gpg --default-key aland@freeradius.org -b $<
freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2: .git
- git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ stable | bzip2 > $@
+ git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION_STRING)/ v3.0.x | bzip2 > $@
freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2
gpg --default-key aland@freeradius.org -b $<
echo suse/freeradius.spec 'Version' needs to be updated; \
exit 1; \
fi
- @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/-0).*//;s/-1).*//;'` != "$(RADIUSD_VERSION_STRING)" ]; then \
+ @if [ `head -n 1 debian/changelog | sed 's/.*(//;s/-0).*//;s/-1).*//;s/\+.*//'` != "$(RADIUSD_VERSION_STRING)" ]; then \
echo debian/changelog needs to be updated; \
exit 1; \
fi
dist-sign: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig
dist-publish: freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2 freeradius-server-$(RADIUSD_VERSION_STRING).tar.gz.sig freeradius-server-$(RADIUSD_VERSION_STRING).tar.bz2.sig
- scp $^ freeradius.org@ns5.freeradius.org:public_ftp
- scp $^ freeradius.org@www.tr.freeradius.org:public_ftp
+ scp $^ freeradius.org@ftp.freeradius.org:public_ftp
#
# Note that we do NOT do the tagging here! We just print out what
warnings:
@(make clean all 2>&1) | egrep -v '^/|deprecated|^In file included|: In function| from |^HEADER|^CC|^LINK' > warnings.txt
@wc -l warnings.txt
+
+#
+# Ensure we're using tabs in the configuration files,
+# and remove trailing whitespace in source files.
+#
+.PHONY: whitespace
+whitespace:
+ @for x in $$(git ls-files raddb/ src/); do unexpand $$x > $$x.bak; cp $$x.bak $$x; rm -f $$x.bak;done
+ @perl -p -i -e 'trim' $$(git ls-files src/)