summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBjörn Mattsson <Bjorn.Mattsson@bth.se>2018-11-09 11:41:43 +0100
committerBjörn Mattsson <Bjorn.Mattsson@bth.se>2018-11-09 11:41:43 +0100
commit582b203b1308fb3354e27cd9eafd3185fe6ccbf2 (patch)
treefa0a946f869e502bc139b6ff0f0829e7f5148f1a /Makefile
parentd0e73973b6abec28cdebd783f31c09026e846803 (diff)
Updated SWAMID-1339
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1ef64d19..debab7fc 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,7 @@ testAttributeInIdP:
test: syntaxtest testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact
-test2: $(SWAMIDXML) testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact
+test2: $(SWAMIDXML) schematest testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact
.time/%.time: swamid-2.0/%.xml
@# make tidy
@@ -275,6 +275,14 @@ test2: $(SWAMIDXML) testMDUI testOrgData testEntCat testSimpleSign testALlevel t
deeptest: test testMDUIreach
+commit2: test2
+ @git diff --color || true
+ @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
+ @echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi
+ @echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
+ @git push
+
commit: tidy test
@git diff --color || true
@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