From 81aaf9409a83e35550705416425eb4aa6f806e05 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Fri, 14 Feb 2014 19:27:04 +0100
Subject: Add check target instead of using shell wrapper

---
 Makefile     |  3 +++
 runtests.sh  | 22 ----------------------
 setup-env.sh | 10 ----------
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100755 runtests.sh
 delete mode 100644 setup-env.sh

diff --git a/Makefile b/Makefile
index 740f06b..74e304c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,4 +10,7 @@ view: html
 check-doc:
 	epydoc --check cnucnu/
 
+check:
+	py.test
+
 FORCE:
diff --git a/runtests.sh b/runtests.sh
deleted file mode 100755
index a8656e4..0000000
--- a/runtests.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/bash
-# vim: foldmethod=marker
-#{{{ License header: GPLv2+
-#    This file is part of cnucnu.
-#
-#    Cnucnu is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    Cnucnu is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with cnucnu.  If not, see <http://www.gnu.org/licenses/>.
-#}}}
-
-. setup-env.sh
-
-py.test
diff --git a/setup-env.sh b/setup-env.sh
deleted file mode 100644
index bbe291a..0000000
--- a/setup-env.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if test -z "${BASH_SOURCE%*/*}"
-then
-    CNUCNU_BASEDIR="${BASH_SOURCE%/*}"
-else
-    CNUCNU_BASEDIR="."
-fi
-
-export PYTHONPATH=${CNUCNU_BASEDIR:-${PWD}}
-
-#echo "new PYTHONPATH: ${PYTHONPATH}"
-- 
cgit