From 6f9b4bbc415db026f080b10a3d3d4400801882b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Thu, 12 Mar 2015 16:13:40 +0100
Subject: Maintenance

* Update copyright years.
* Update erlang.mk.
* Fix triq testing.
---
 Makefile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8b1d1b4..fc3b0f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,13 @@
 # See LICENSE for licensing information.
 
 PROJECT = cowlib
+#ERLC_OPTS += +bin_opt_info
+TEST_ERLC_OPTS += +'{parse_transform, eunit_autoexport}' +'{parse_transform, horse_autoexport}'
 PLT_APPS = crypto
 
+TEST_DEPS = triq
+dep_triq = git https://github.com/krestenkrab/triq master
+
 include erlang.mk
 
 .PHONY: gen perfs
@@ -32,12 +37,15 @@ gen:
 
 # Performance testing.
 
+ifeq ($(MAKECMDGOALS),perfs)
+.NOTPARALLEL:
+endif
+
 deps/horse:
 	git clone -n -- https://github.com/extend/horse $(DEPS_DIR)/horse
 	cd $(DEPS_DIR)/horse ; git checkout -q master
 	$(MAKE) -C $(DEPS_DIR)/horse
 
-perfs: ERLC_OPTS += -DPERF=1 +'{parse_transform, horse_autoexport}' -DEXTRA=1
-perfs: clean deps deps/horse app
+perfs: test-build
 	$(gen_verbose) erl -noshell -pa ebin deps/horse/ebin \
-		-eval 'horse:app_perf($(PROJECT)), init:stop().'
+		-eval 'horse:app_perf($(PROJECT)), erlang:halt().'
-- 
cgit v1.2.3