Skip to content

Commit

Permalink
Hacks for allow_vulnerable_openssl=yes and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
alandekok committed Apr 8, 2014
1 parent 2338da2 commit 6c9cf1e
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions Makefile
Expand Up @@ -24,17 +24,29 @@ export DESTDIR := $(R)
# And over-ride all of the other magic.
include scripts/boiler.mk

#
# 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.
#
$(BUILD_DIR)/tests/radiusd-c: ${BUILD_DIR}/bin/radiusd | build.raddb
@$(MAKE) -C raddb/certs
@printf "radiusd -C... "
@if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -n debug -D ./share | tee $(BUILD_DIR)/tests/radiusd.config.log 2>&1; then \
@if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -n test -D ./share | tee $(BUILD_DIR)/tests/radiusd.config.log 2>&1; 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 $@

Expand All @@ -44,8 +56,9 @@ test: ${BUILD_DIR}/bin/radiusd ${BUILD_DIR}/bin/radclient tests.unit tests.keywo
#  Tests specifically for Travis.  We do a LOT more than just
#  the above tests
ifneq "$(findstring travis,${prefix})" ""
travis-test: test
@./build/make/jlibtool --mode=execute ./build/bin/radiusd -xxxv
travis-test: raddb/test.conf test
@./build/make/jlibtool --mode=execute ./build/bin/radiusd -xxxv -n test
@rm -f raddb/test.conf
@$(MAKE) install
@${sbindir}/radiusd -XC
@$(MAKE) deb
Expand Down

0 comments on commit 6c9cf1e

Please sign in to comment.