diff options
| author | Loïc Hoguin <[email protected]> | 2016-11-04 11:41:31 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2016-11-04 11:41:31 +0200 |
| commit | 8e6d0f462850a90bd8a60995f52027839288d038 (patch) | |
| tree | 05fc21db6ceb6524e198c04534b9ca72cbbe6bdf | |
| parent | 7b0be1d6e2070a187a7e439c82c00e9aca977103 (diff) | |
| download | cowlib-8e6d0f462850a90bd8a60995f52027839288d038.tar.gz cowlib-8e6d0f462850a90bd8a60995f52027839288d038.tar.bz2 cowlib-8e6d0f462850a90bd8a60995f52027839288d038.zip | |
Run perfs in CI
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | erlang.mk | 17 |
2 files changed, 13 insertions, 8 deletions
@@ -15,7 +15,7 @@ DIALYZER_OPTS = -Werror_handling -Wunmatched_returns CI_OTP ?= OTP-18.0.3 OTP-18.1.5 OTP-18.2.4.1 OTP-18.3.4.4 OTP-19.0.7 OTP-19.1.5 CI_HIPE ?= OTP-19.1.5 -CI_HIPE_LLVM ?= $(CI_HIPE) +CI_ERLLVM ?= $(CI_HIPE) TEST_ERLC_OPTS += +'{parse_transform, eunit_autoexport}' +'{parse_transform, horse_autoexport}' TEST_DEPS = horse triq @@ -55,6 +55,8 @@ ifeq ($(MAKECMDGOALS),perfs) .NOTPARALLEL: endif +ci-extra:: perfs + perfs: test-build $(gen_verbose) erl -noshell -pa ebin deps/horse/ebin \ -eval 'horse:app_perf($(PROJECT)), erlang:halt().' @@ -16,7 +16,7 @@ ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) -ERLANG_MK_VERSION = 2016.11.03-2-gf7e7898 +ERLANG_MK_VERSION = 2016.11.03-4-g9e9b7d2 # Make 3.81 and 3.82 are deprecated. @@ -6011,17 +6011,17 @@ endif CI_OTP ?= CI_HIPE ?= -CI_HIPE_LLVM ?= +CI_ERLLVM ?= ifeq ($(CI_VM),native) ERLC_OPTS += +native TEST_ERLC_OPTS += +native -else ifeq ($(CI_VM),native-llvm) +else ifeq ($(CI_VM),erllvm) ERLC_OPTS += +native +'{hipe, [to_llvm]}' TEST_ERLC_OPTS += +native +'{hipe, [to_llvm]}' endif -ifeq ($(strip $(CI_OTP) $(CI_HIPE) $(CI_HIPE_LLVM)),) +ifeq ($(strip $(CI_OTP) $(CI_HIPE) $(CI_ERLLVM)),) ci:: else @@ -6040,12 +6040,14 @@ OTP_GIT ?= https://github.com/erlang/otp CI_INSTALL_DIR ?= $(HOME)/erlang -ci:: $(addprefix ci-,$(CI_OTP) $(addsuffix -native,$(CI_HIPE)) $(addsuffix -native-llvm,$(CI_HIPE_LLVM))) +ci:: $(addprefix ci-,$(CI_OTP) $(addsuffix -native,$(CI_HIPE)) $(addsuffix -erllvm,$(CI_ERLLVM))) ci-prepare: $(addprefix $(CI_INSTALL_DIR)/,$(CI_OTP) $(addsuffix -native,$(CI_HIPE))) ci-setup:: +ci-extra:: + ci_verbose_0 = @echo " CI " $(1); ci_verbose = $(ci_verbose_$(V)) @@ -6058,11 +6060,12 @@ ci-$1: $(CI_INSTALL_DIR)/$2 CT_OPTS="-label $1" \ CI_VM="$3" \ $(MAKE) ci-setup tests + $(verbose) $(MAKE) --no-print-directory ci-extra endef $(foreach otp,$(CI_OTP),$(eval $(call ci_target,$(otp),$(otp),otp))) $(foreach otp,$(CI_HIPE),$(eval $(call ci_target,$(otp)-native,$(otp)-native,native))) -$(foreach otp,$(CI_HIPE_LLVM),$(eval $(call ci_target,$(otp)-native-llvm,$(otp)-native,native-llvm))) +$(foreach otp,$(CI_ERLLVM),$(eval $(call ci_target,$(otp)-erllvm,$(otp)-native,erllvm))) define ci_otp_target ifeq ($(wildcard $(CI_INSTALL_DIR)/$(1)),) @@ -6083,7 +6086,7 @@ $(CI_INSTALL_DIR)/$1-native: $(KERL) endif endef -$(foreach otp,$(sort $(CI_HIPE) $(CI_HIPE_LLVM)),$(eval $(call ci_hipe_target,$(otp)))) +$(foreach otp,$(sort $(CI_HIPE) $(CI_ERLLLVM)),$(eval $(call ci_hipe_target,$(otp)))) $(KERL): $(verbose) mkdir -p $(ERLANG_MK_TMP) |