From f5f480c5750b76b662430b62ef85ebceea5aadc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 17 Aug 2015 16:52:46 +0200 Subject: Beginnings of modernizing the test suite Merging because I have to do other work but this is still a nice enough improvement. --- Makefile | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 926027f..24900a6 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,10 @@ PROJECT = ranch -# Dependencies. - -TEST_DEPS = ct_helper -dep_ct_helper = git https://github.com/extend/ct_helper.git master - # Options. COMPILE_FIRST = ranch_transport +CT_OPTS += -pa test -ct_hooks ranch_ct_hook [] PLT_APPS = crypto public_key ssl CI_OTP = \ OTP_R15B01 OTP_R15B02 OTP_R15B03-1 \ @@ -17,11 +13,20 @@ CI_OTP = \ OTP-17.0.2 OTP-17.1.2 OTP-17.2.2 OTP-17.3.4 OTP-17.4.1 OTP-17.5.6.2 \ OTP-18.0.2 -# CI setup. +# Dependencies. -ci-setup:: $(DEPS_DIR)/ct_helper - cp ~/.kerl/builds/$(CI_OTP_RELEASE)/otp_src_git/lib/ssl/test/erl_make_certs.erl deps/ct_helper/src/ +TEST_DEPS = ct_helper +dep_ct_helper = git https://github.com/extend/ct_helper.git master # Standard targets. include erlang.mk + +# Also dialyze the tests. + +DIALYZER_OPTS += --src -r test + +# Use erl_make_certs from the tested release. + +ci-setup:: $(DEPS_DIR)/ct_helper + cp ~/.kerl/builds/$(CI_OTP_RELEASE)/otp_src_git/lib/ssl/test/erl_make_certs.erl deps/ct_helper/src/ -- cgit v1.2.3