[gentoo-commits] repo/gentoo:master commit in: dev-ada/xmlada/, dev-ada/xmlada/files/

[Alfredo Tupone]

commit:     98650a8ee260b20fd63b8d26dbf800226cc83280
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  4 20:48:54 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 20:48:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98650a8e

dev-ada/xmlada: Providing test

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-ada/xmlada/files/xmlada-2016-gentoo.patch | 25 +++++++++++++++++++++-
 dev-ada/xmlada/files/xmlada-2017-gentoo.patch | 30 +++++++++++++++++++++++++++
 dev-ada/xmlada/xmlada-2016.ebuild             |  5 +++++
 dev-ada/xmlada/xmlada-2017.ebuild             |  7 +++++++
 4 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
index 7c28a02289f..a90b963edd3 100644
--- a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
@@ -1,6 +1,6 @@
 --- xmlada-2016-src/Makefile.in.old	2016-12-04 21:58:57.251338692 +0100
 +++ xmlada-2016-src/Makefile.in	2016-12-04 21:59:31.332755615 +0100
-@@ -49,13 +49,13 @@
+@@ -49,16 +49,17 @@
  endif
  
  static:
@@ -17,3 +17,26 @@
  
  # Rebuild the tests (and not the XML/Ada code itself)
  test: force
++	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+ 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
+ 		-XTESTS_ACTIVATED=Only xmlada.gpr
+ 
+--- xmlada-gpl-2016-src/tests/Makefile.old	2017-12-04 21:15:16.330459020 +0100
++++ xmlada-gpl-2016-src/tests/Makefile	2017-12-04 21:15:33.176156634 +0100
+@@ -1,8 +1,6 @@
+ TESTS= test_unicode \
+ 		 test_state \
+-		 test_xml \
+ 		 test_adacore_dom \
+-		 test_schema \
+ 		 test_date_time \
+ 		 test_numbers \
+ 		 test_adacore_schema \
+@@ -71,6 +71,7 @@
+ test_multiple_xsd:
+ 	@echo "multiple xsd"
+ 	@cd schema/multiple_xsd; \
++		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
+ 		gprbuild -q -Pdefault.gpr; \
+ 		./validate > $(RESULTS)/multiple_xsd.out; \
+ 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \

diff --git a/dev-ada/xmlada/files/xmlada-2017-gentoo.patch b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
new file mode 100644
index 00000000000..9e79572e306
--- /dev/null
+++ b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
@@ -0,0 +1,30 @@
+--- xmlada-gpl-2017-src/Makefile.in.old	2017-12-04 20:09:23.730805855 +0100
++++ xmlada-gpl-2017-src/Makefile.in	2017-12-04 20:09:51.586331155 +0100
+@@ -62,7 +62,8 @@
+ 
+ # Rebuild the tests (and not the XML/Ada code itself)
+ test: force
++	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+ 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
+ 		-XTESTS_ACTIVATED=Only xmlada.gpr
+ 
+ # Run the tests. This requires an install of XML/Ada first
+--- xmlada-gpl-2017-src/tests/Makefile.old	2017-12-04 21:38:29.722818904 +0100
++++ xmlada-gpl-2017-src/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
+@@ -1,8 +1,6 @@
+ TESTS= test_unicode \
+ 		 test_state \
+-		 test_xml \
+ 		 test_adacore_dom \
+-		 test_schema \
+ 		 test_date_time \
+ 		 test_numbers \
+ 		 test_adacore_schema \
+@@ -71,6 +71,7 @@
+ test_multiple_xsd:
+ 	@echo "multiple xsd"
+ 	@cd schema/multiple_xsd; \
++		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
+ 		gprbuild -q -Pdefault.gpr; \
+ 		./validate > $(RESULTS)/multiple_xsd.out; \
+ 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \

diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild
index a99eb9103ca..585a5492bb7 100644
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ b/dev-ada/xmlada/xmlada-2016.ebuild
@@ -40,6 +40,11 @@ src_compile () {
 	done
 }
 
+src_test() {
+	emake test
+	emake run_test | grep DIFF && die
+}
+
 src_install () {
 	for kind in shared static static-pic; do
 		if use ${kind}; then

diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index 4d5d16493c3..b80b4c4237f 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MYP}-src
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure () {
 	econf --prefix="${D}"/usr
 }
@@ -45,6 +47,11 @@ src_compile () {
 	done
 }
 
+src_test() {
+	emake test
+	emake run_test | grep DIFF && die
+}
+
 src_install () {
 	for kind in shared static static-pic; do
 		if use ${kind}; then