[PATCH vkd3d] build: Disable crosstests as well if tests are disabled.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index d296dfd4b..f69f1ea4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,7 @@ AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
 dnl Output configuration summary
-AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"],
+AS_IF([test "x$enable_tests" != "xno" -a \( "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno" \)],
       [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no])
 AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no])
 
@@ -166,6 +166,6 @@ AS_ECHO(["
   Building documentation: ${HAVE_DOCS}
 
   Building crosstests: ${HAVE_CROSSTEST}"])
-AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
-AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
+AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
+AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
 AS_ECHO([])
-- 
2.34.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=106014

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: configure.ac:148
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: configure.ac:148
Task: Patch failed to apply

[Giovanni Mascellani]

Hi,

does this patch change anything other than what is printed at the end of 
the configuration step? It seems to me that the only variable that 
changes with this commit is HAVE_CROSSTEST, and I can't see where that 
is used other than at the end of configure.ac.

Also, configuring with --disable-tests and then running "make crosstest" 
happily compiled the cross tests for me.

Giovanni.


Il 26/01/22 01:17, Zebediah Figura ha scritto:
> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
> ---
>   configure.ac | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index d296dfd4b..f69f1ea4a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -148,7 +148,7 @@ AC_CONFIG_FILES([Makefile])
>   AC_OUTPUT
>
> dnl Output configuration summary
> -AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"],
> +AS_IF([test "x$enable_tests" != "xno" -a \( "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno" \)],
>         [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no])
>   AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no])
>
> @@ -166,6 +166,6 @@ AS_ECHO(["
>     Building documentation: ${HAVE_DOCS}
>
> Building crosstests: ${HAVE_CROSSTEST}"])
> -AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
> -AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
> +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
> +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
>   AS_ECHO([])

[Zebediah Figura (she/her)]

On 1/26/22 01:54, Giovanni Mascellani wrote:
> Hi,
>
> does this patch change anything other than what is printed at the end of 
> the configuration step? It seems to me that the only variable that 
> changes with this commit is HAVE_CROSSTEST, and I can't see where that 
> is used other than at the end of configure.ac.

Indeed it does not; I incorrectly assumed that HAVE_CROSSTEST was not 
used by Makefile.am (and in fact failed to notice that it was not 
defined as an AM conditional).

I'll resend this patch with that fixed.