aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-01-04 17:56:49 +0100
committerLoïc Hoguin <[email protected]>2013-01-04 17:56:49 +0100
commit7d2a4814019816da969ce2269ec8684024f4a88a (patch)
treeba3d40d599d8905e54185f6083bef67d7222ff9a
parent54063de2ff0beda7a18058063360f4b5b6dcf6e5 (diff)
downloadcowboy-7d2a4814019816da969ce2269ec8684024f4a88a.tar.gz
cowboy-7d2a4814019816da969ce2269ec8684024f4a88a.tar.bz2
cowboy-7d2a4814019816da969ce2269ec8684024f4a88a.zip
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.
-rw-r--r--Makefile19
-rwxr-xr-xtest/autobahn_SUITE_data/test.py2
-rw-r--r--test/cover.spec (renamed from cover.spec)0
3 files changed, 14 insertions, 7 deletions
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/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/cover.spec b/test/cover.spec
index 9dba11c..9dba11c 100644
--- a/cover.spec
+++ b/test/cover.spec