From 9add00445618057e16e0b7cf48c10bae255d49d2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 26 Apr 2024 10:51:47 +0200 Subject: Make odfvalidator and officeotron work in WSL_ONLY_AS_HELPER mode ...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 Tested-by: Jenkins --- bin/odfvalidator.sh.in | 2 +- bin/officeotron.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in index 605e74731f20..99b2207ad138 100644 --- a/bin/odfvalidator.sh.in +++ b/bin/odfvalidator.sh.in @@ -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@ "$@" diff --git a/bin/officeotron.sh.in b/bin/officeotron.sh.in index 7281f1bcd17c..935ec5809cdd 100644 --- a/bin/officeotron.sh.in +++ b/bin/officeotron.sh.in @@ -1,2 +1,2 @@ #!/usr/bin/env bash -java -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@" +java -jar @TARFILE_LOCATION_NATIVE@/@OFFICEOTRON_JAR@ "$@" -- cgit