diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-04-23 11:16:52 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 14:03:03 +0200 |
| commit | b68d717360d7141de62bf9391d8af5b073333f9d (patch) | |
| tree | 0c1ee6c6904ed25ae0b0eb6882ca5277dd26513d | |
| parent | 9bd93466e47c3a472b273f3846169afbdf063885 (diff) | |
Support --with-junit/hamcrest in WSL_ONLY_AS_HELPER mode
...where it failed with
> checking for JUnit 4... ./configure: line 47354: cygpath: command not found
Change-Id: I56c930b6c8b738b39f26766f90476c32efb383e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166508
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 48faa25c4acc..6c2cd76b904a 100644 --- a/configure.ac +++ b/configure.ac @@ -14318,7 +14318,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" -a "$cross_compiling" != " OOO_JUNIT_JAR=$with_junit fi if test "$_os" = "WINNT"; then - OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"` + PathFormat "$OOO_JUNIT_JAR" + OOO_JUNIT_JAR="$formatted_path" fi printf 'import org.junit.Before;' > conftest.java if $JAVACOMPILER -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then @@ -14354,7 +14355,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" -a "$cross_compiling" != " HAMCREST_JAR=$with_hamcrest fi if test "$_os" = "WINNT"; then - HAMCREST_JAR=`cygpath -m "$HAMCREST_JAR"` + PathFormat "$HAMCREST_JAR" + HAMCREST_JAR="$formatted_path" fi if $JAVACOMPILER -classpath "$HAMCREST_JAR" conftest.java >&5 2>&5; then AC_MSG_RESULT([$HAMCREST_JAR]) |