X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=Makefile;h=ec3ce47a440904c988c4335da41072df04b85584;hb=0afc14ecf1c3d94bc59d2dd7f1cee6420a0b98dd;hp=e558b481d7b6a0f256ebab5d75be5650fd2f2fa8;hpb=21523f498da27ee43cb48acb70e8760decb46a5d;p=cascardo%2Fipsilon.git

diff --git a/Makefile b/Makefile
index e558b48..ec3ce47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,48 @@
 RPMBUILD = $(PWD)/dist/rpmbuild
 
-all: lint pep8
+all: testdeps lint pep8 test
+	echo "All tests passed"
+
+testdeps:
+	# Determine if test deps are installed
+	# First, some binaries
+	which lessc
+	which pylint
+	which pep8
+	which httpd
+	which postgres
+	which openssl
+	which slapd
+	# Now, python libraries
+	python -c 'import openid'
+	python -c 'import openid_teams'
+	python -c 'import openid_cla'
+	python -c 'import cherrypy'
+	python -c 'import M2Crypto'
+	python -c 'import lasso'
+	python -c 'import sqlalchemy'
+	python -c 'import ldap'
+	python -c 'import pam'
+	python -c 'import fedora'
+	python -c 'import ipapython'
+	python -c 'import jinja2'
+	python -c 'import psycopg2'
+	# And now everything else
+	ls /usr/share/doc/sssd
+	ls /usr/lib64/libsss_simpleifp.so.0
+	ls /usr/lib64/httpd/modules/mod_wsgi.so
+	ls /usr/libexec/mod_auth_mellon
 
 lint:
 	# Analyze code
 	# don't show recommendations, info, comments, report
 	# W0613 - unused argument
 	# Ignore cherrypy class members as they are dynamically added
+	# Ignore IPA API class members as they are dynamically added
 	pylint -d c,r,i,W0613 -r n -f colorized \
 		   --notes= \
-		   --ignored-classes=cherrypy \
+		   --ignored-classes=cherrypy,API \
+		   --disable=star-args \
 		   ./ipsilon
 
 pep8:
@@ -21,6 +54,7 @@ ui: less/ipsilon.less less/admin.less
 	# Create CSS
 	lesscpy less/ipsilon.less > ui/css/ipsilon.css
 	lesscpy less/admin.less > ui/css/admin.css
+	lesscpy less/styles.less > ui/css/styles.css
 
 # Requires NodeJS less and clear-css packages
 # Should be removed when lesscpy starts to work properly
@@ -45,6 +79,7 @@ lp-test:
 	pylint -d c,r,i,W0613 -r n -f colorized \
 		   --notes= \
 		   --ignored-classes=cherrypy \
+		   --disable=star-args \
 		   ./tests
 	pep8 tests
 
@@ -56,12 +91,27 @@ wrappers:
 	#SOCKET_WRAPPER_DEFAULT_IFACE=9
 
 tests: wrappers
+	rm -rf testdir
 	PYTHONPATH=./ ./tests/tests.py --test=test1
+	PYTHONPATH=./ ./tests/tests.py --test=testlogout
+	PYTHONPATH=./ ./tests/tests.py --test=testnameid
+	PYTHONPATH=./ ./tests/tests.py --test=testrest
+	PYTHONPATH=./ ./tests/tests.py --test=testmapping
+	PYTHONPATH=./ ./tests/tests.py --test=testgssapi
 	PYTHONPATH=./ ./tests/tests.py --test=attrs
 	PYTHONPATH=./ ./tests/tests.py --test=trans
+	PYTHONPATH=./ ./tests/tests.py --test=pgdb
+	PYTHONPATH=./ ./tests/tests.py --test=fconf
+	PYTHONPATH=./ ./tests/tests.py --test=ldap
+	PYTHONPATH=./ ./tests/tests.py --test=ldapdown
+	PYTHONPATH=./ ./tests/tests.py --test=openid
+	PYTHONPATH=./ ./tests/tests.py --test=dbupgrades
+
+test: lp-test unittests tests
 
-test: lp-test tests
+unittests:
 	PYTHONPATH=./ ./ipsilon/tools/saml2metadata.py
+	PYTHONPATH=./ python ./ipsilon/util/policy.py
 
 sdist:
 	python setup.py sdist
@@ -80,9 +130,14 @@ rpmdistdir:
 
 rpms: rpmroot rpmdistdir sdist
 	cp dist/ipsilon*.tar.gz $(RPMBUILD)/SOURCES/
-	rpmbuild --define "_topdir $(RPMBUILD)" -ba contrib/fedora/ipsilon.spec
+	rpmbuild --define "gittag .git`git rev-parse --short HEAD`" --define "builddate .`date +%Y%m%d%H%M`" --define "_topdir $(RPMBUILD)" -ba contrib/fedora/ipsilon.spec
 	mv $(RPMBUILD)/RPMS/*/ipsilon-*.rpm dist/rpms/
 	mv $(RPMBUILD)/SRPMS/ipsilon-*.src.rpm dist/srpms/
 	rm -rf $(RPMBUILD)
 
-rpms: sdist
+releaserpms: rpmroot rpmdistdir sdist
+	cp dist/ipsilon*.tar.gz $(RPMBUILD)/SOURCES/
+	rpmbuild --define "_topdir $(RPMBUILD)" -ba contrib/fedora/ipsilon.spec
+	mv $(RPMBUILD)/RPMS/*/ipsilon-*.rpm dist/rpms/
+	mv $(RPMBUILD)/SRPMS/ipsilon-*.src.rpm dist/srpms/
+	rm -rf $(RPMBUILD)