strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make odfvalidator and officeotron work in WSL_ONLY_AS_HELPER mode

Browse source 
...where e.g. CppunitTest_oox_testscene3d
CPPUNIT_TEST_NAME=test_material_wireframe::TestBody had failed with

> forced failure
> - Error: Unable to access jarfile /mnt/d/lo/tar/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar

and e.g. CppunitTest_oox_mcgr
CPPUNIT_TEST_NAME=testAxialColorLinearTrans::TestBody had failed with

> equality assertion failed
> - Expected: 0
> - Actual  : 1
> - failed to execute: sh D:/lo-wsl/core/bin/officeotron.sh C:\Users\steph\AppData\Local\Temp\test_oox_mcgr.dll2epgul.tmp > C:\Users\steph\AppData\Local\Temp\test_oox_mcgr.dll2epgup.tmp 2>&1
> Error: Unable to access jarfile /mnt/d/lo/tar/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar

Change-Id: I094b76daff6eef2cb6a9874a4776bab9c4424f49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166703
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
Stephan Bergmann 2024-04-26 10:51:47 +02:00
parent a1e5496e4d
commit 9add004456
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/odfvalidator.sh.in
View file

@ -1,2 +1,2 @@
#!/usr/bin/env bash
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 @TARFILE_LOCATION@/@ODFVALIDATOR_JAR@ "$@"
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 @TARFILE_LOCATION_NATIVE@/@ODFVALIDATOR_JAR@ "$@"

2
bin/officeotron.sh.in
View file

@ -1,2 +1,2 @@
#!/usr/bin/env bash
java -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@"
java -jar @TARFILE_LOCATION_NATIVE@/@OFFICEOTRON_JAR@ "$@"

3
configure.ac
View file

@ -6299,7 +6299,10 @@ else
PathFormat "${absolute_path}"
TARFILE_LOCATION="${formatted_path_unix}"
fi
PathFormat "$TARFILE_LOCATION"
TARFILE_LOCATION_NATIVE="$formatted_path"
AC_SUBST(TARFILE_LOCATION)
AC_SUBST(TARFILE_LOCATION_NATIVE)
AC_MSG_CHECKING([whether we want to fetch tarballs])
if test "$enable_fetch_external" != "no"; then