diff options
| author | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-12-13 11:47:13 +0100 |
|---|---|---|
| committer | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-12-13 11:47:13 +0100 |
| commit | 964983dbdd4237fd7c606e1ce43a0724f2172904 (patch) | |
| tree | acb37d5211fcbebfdd30c5a768551765fadbad66 | |
| parent | 49ff463522aca8cc9b1885d275f8fef926325556 (diff) | |
check for entity-categories and mdui moved to committest
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -114,10 +114,6 @@ swamid-ki-sll: test: clean swamid2-deps @for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x 2>&1 ; done | sed 's/fails to validate/[1;31m&[0m/;s/validates/[1;32m&[0m/' @for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x > /dev/null 2>&1 || exit 1 ; done - @echo "Checking for entity-categories in SPSSODescriptors" - @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | xmllint --xpath /EntityDescriptor/SPSSODescriptor/Extensions/EntityAttributes - 2>/dev/null | grep -q entity-category ; then echo " $$x" ; fi ; done | grep . && exit 1 || true - @echo "Checking for MDUI in EntityDescriptor/Extensions" - @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | xmllint --xpath /EntityDescriptor/Extensions/UIInfo - 2>/dev/null | grep -q . ; then echo " $$x" ; fi ; done | grep . && exit 1 || true clean: @rm -f *.xml *.tbs *.n @@ -125,7 +121,13 @@ clean: tidy: @for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done -commit: tidy test +committest: test + @echo "Checking for entity-categories in SPSSODescriptors" + @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | xmllint --xpath /EntityDescriptor/SPSSODescriptor/Extensions/EntityAttributes - 2>/dev/null | grep -q entity-category ; then echo " $$x" ; fi ; done | grep . && exit 1 || true + @echo "Checking for MDUI in EntityDescriptor/Extensions" + @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | xmllint --xpath /EntityDescriptor/Extensions/UIInfo - 2>/dev/null | grep -q . ; then echo " $$x" ; fi ; done | grep . && exit 1 || true + +commit: tidy committest @git diff --color @echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac @git status -u |