From 7d2a4814019816da969ce2269ec8684024f4a88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 4 Jan 2013 17:56:49 +0100
Subject: Use ct_run instead of rebar ct for running ct tests

Small tweak to the autobahn test file, we look for the python2
executable now. It'll make my life easier.
---
 Makefile                         | 19 +++++++++++++------
 cover.spec                       |  1 -
 test/autobahn_SUITE_data/test.py |  2 +-
 test/cover.spec                  |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 cover.spec
 create mode 100644 test/cover.spec

diff --git a/Makefile b/Makefile
index 004d732..60a5f95 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 
 PROJECT = cowboy
 
-DIALYZER = dialyzer
 REBAR = rebar
 
 all: app
@@ -37,19 +36,27 @@ deps/proper:
 
 tests: clean deps/proper app eunit ct
 
-inttests: clean deps/proper app eunit intct
-
 eunit:
 	@$(REBAR) -C rebar.tests.config eunit skip_deps=true
 
+CT_RUN = ct_run \
+	-pa ebin deps/*/ebin \
+	-dir test \
+	-logdir logs \
+	-cover test/cover.spec
+
 ct:
-	@$(REBAR) -C rebar.tests.config ct skip_deps=true suites=http,ws
+	@mkdir -p logs/
+	@$(CT_RUN) -suite http_SUITE ws_SUITE
 
-intct:
-	@$(REBAR) -C rebar.tests.config ct skip_deps=true suites=http,ws,autobahn
+autobahn:
+	@mkdir -p logs/
+	@$(CT_RUN) -suite autobahn_SUITE
 
 # Dialyzer.
 
+DIALYZER = dialyzer
+
 build-plt:
 	@$(DIALYZER) --build_plt --output_plt .$(PROJECT).plt \
 		--apps kernel stdlib sasl inets crypto public_key ssl deps/*
diff --git a/cover.spec b/cover.spec
deleted file mode 100644
index 9dba11c..0000000
--- a/cover.spec
+++ /dev/null
@@ -1 +0,0 @@
-{incl_app, cowboy, details}.
diff --git a/test/autobahn_SUITE_data/test.py b/test/autobahn_SUITE_data/test.py
index c528c64..3cc5794 100755
--- a/test/autobahn_SUITE_data/test.py
+++ b/test/autobahn_SUITE_data/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 import os
 import os.path
 import sys
diff --git a/test/cover.spec b/test/cover.spec
new file mode 100644
index 0000000..9dba11c
--- /dev/null
+++ b/test/cover.spec
@@ -0,0 +1 @@
+{incl_app, cowboy, details}.
-- 
cgit v1.2.3