diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-26 10:51:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-26 22:29:52 +0200 |
| commit | 9add00445618057e16e0b7cf48c10bae255d49d2 (patch) | |
| tree | 54fa411245f17ca38cebc654a0454074051e585b | |
| parent | a1e5496e4daf469840d5bcc31fede4d4d66aebfe (diff) | |
...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
| -rw-r--r-- | bin/odfvalidator.sh.in | 2 | ||||
| -rw-r--r-- | bin/officeotron.sh.in | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 5 insertions, 2 deletions
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@ "$@" diff --git a/configure.ac b/configure.ac index 6c2cd76b904a..4263116f894b 100644 --- a/configure.ac +++ b/configure.ac @@ -6296,13 +6296,16 @@ if test -z "$TARFILE_LOCATION"; then TARFILE_LOCATION="$SRC_ROOT/external/tarballs" else AbsolutePath "$TARFILE_LOCATION" 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 if test "$with_all_tarballs" = "yes"; then AC_MSG_RESULT([yes, all of them]) DO_FETCH_TARBALLS="ALL" |