__init__ needs to be in the main package

[cascardo/ipsilon.git] / Makefile

diff --git a/Makefile b/Makefile
index 0d7e01a..f527641 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 RPMBUILD = $(PWD)/dist/rpmbuild
 
-all: lint pep8
+all: lint pep8 test
+       echo "All tests passed"
 
 lint:
        # Analyze code
@@ -25,12 +26,21 @@ ui: less/ipsilon.less less/admin.less
 # Requires NodeJS less and clear-css packages
 # Should be removed when lesscpy starts to work properly
 ui-node: less/ipsilon.less less/admin.less
+
        # Create and minify CSS
-       lessc --clean-css less/ipsilon.less ui/css/ipsilon.css
-       lessc --clean-css less/admin.less ui/css/admin.css
+       #lessc --clean-css less/ipsilon.less ui/css/ipsilon.css
+       #lessc --clean-css less/admin.less ui/css/admin.css
+
+       #FIXME: temporarily disable clean-css fo deveopment
+       lessc less/ipsilon.less ui/css/ipsilon.css
+       lessc less/admin.less ui/css/admin.css
 
 clean:
-       rm -fr testdir
+       rm -fr testdir cscope.out
+       find ./ -name '*.pyc' -exec rm -f {} \;
+
+cscope:
+       git ls-files | xargs pycscope
 
 lp-test:
        pylint -d c,r,i,W0613 -r n -f colorized \
@@ -39,9 +49,26 @@ lp-test:
                   ./tests
        pep8 tests
 
-test: lp-test
+wrappers:
+       #rm -fr wrapdir
+       #mkdir wrapdir
+       #LD_PRELOAD=libsocket_wrapper.so
+       #SOCKET_WRAPPER_DIR=wrapdir
+       #SOCKET_WRAPPER_DEFAULT_IFACE=9
+
+tests: wrappers
+       PYTHONPATH=./ ./tests/tests.py --test=test1
+       PYTHONPATH=./ ./tests/tests.py --test=testlogout
+       PYTHONPATH=./ ./tests/tests.py --test=attrs
+       PYTHONPATH=./ ./tests/tests.py --test=trans
+       PYTHONPATH=./ ./tests/tests.py --test=pgdb
+       PYTHONPATH=./ ./tests/tests.py --test=fconf
+
+test: lp-test unittests tests
+
+unittests:
        PYTHONPATH=./ ./ipsilon/tools/saml2metadata.py
-       ./tests/tests.py --test=test1
+       PYTHONPATH=./ python ./ipsilon/util/policy.py
 
 sdist:
        python setup.py sdist