test-bugzilla-files/config | 1 +
test-bugzilla-files/config.asan | 1 +
test-bugzilla-files/test-bugzilla-files.py | 28 ++++++++++++++++++++++------
3 files changed, 24 insertions(+), 6 deletions(-)
New commits:
commit 45d61e8b563455b323593c9fc9df7768fcd21f01
Author: Michael Stahl <michael.st...@cib.de>
Date: Fri Jun 29 17:59:20 2018 +0200
test-bugzilla-files: validate using libreoffice ODF extension schemas
... from core repo.
Change-Id: Id5a6fa25bbd8232de8e3dcbada30dcbd77f02723
diff --git a/test-bugzilla-files/config b/test-bugzilla-files/config
index c2d51dd..2dfe576 100644
--- a/test-bugzilla-files/config
+++ b/test-bugzilla-files/config
@@ -1,3 +1,4 @@
export CRASHTESTDATA=/srv/crashtestdata
+export SRCDIR=/home/buildslave/source/libo-core
export INSTDIR=/home/buildslave/build/instdir
export USERDIR=/home/buildslave/.config
diff --git a/test-bugzilla-files/config.asan b/test-bugzilla-files/config.asan
index 88c8bec..8f0e826 100644
--- a/test-bugzilla-files/config.asan
+++ b/test-bugzilla-files/config.asan
@@ -1,3 +1,4 @@
export CRASHTESTDATA=/srv/crashtestdata
+export SRCDIR=/home/buildslave/source/libo-core
export INSTDIR=/srv/crashtestdata/asan-build/instdir/program
export USERDIR=/home/buildslave/.config
diff --git a/test-bugzilla-files/test-bugzilla-files.py
b/test-bugzilla-files/test-bugzilla-files.py
index d48d56b..8a63a21 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -431,12 +431,28 @@ class ExportFileTest:
if self.enable_validation == False:
return None
- validationCommand = { "calc8" : "java
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-jar /home/buildslave/source/bin/odfvalidator.jar -e",
- "writer8" : "java
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-jar /home/buildslave/source/bin/odfvalidator.jar -e",
- "impress8" : "java
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-jar /home/buildslave/source/bin/odfvalidator.jar -e",
- "draw8" : "java
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-jar /home/buildslave/source/bin/odfvalidator.jar -e",
- "math8" : "java
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-jar /home/buildslave/source/bin/odfvalidator.jar -e",
- "StarOffice XML (Base)" : "java
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-jar /home/buildslave/source/bin/odfvalidator.jar -e",
+ # use libreoffice extension schemas from core repo
+ # invoke without -e so that we know when something new is written
+ # in loext namespace that isn't yet in the custom schema
+ SRCDIR = os.environ["SRCDIR"]
+ odfvalidator = ("java"
+ + "
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl";
+ + "
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl"
+ + " -jar /home/buildslave/source/bin/odfvalidator.jar "
+ + " -M "
+ + os.path.join(SRCDIR,
"schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng")
+ + " -D "
+ + os.path.join(SRCDIR,
"schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng")
+ + " -O "
+ + os.path.join(SRCDIR,
"schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng")
+ + " -m "
+ + os.path.join(SRCDIR, "schema/mathml2/mathml2.xsd"))
+ validationCommand = { "calc8" : odfvalidator,
+ "writer8" : odfvalidator,
+ "impress8" : odfvalidator,
+ "draw8" : odfvalidator,
+ "math8" : odfvalidator,
+ "StarOffice XML (Base)" : odfvalidator,
"Calc Office Open XML": "java -jar
/home/buildslave/source/bin/officeotron.jar",
"Office Open XML Text": "java -jar
/home/buildslave/source/bin/officeotron.jar",
"Impress Office Open XML": "java -jar
/home/buildslave/source/bin/officeotron.jar"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
