fate: Skip the checkasm test if CONFIG_STATIC is disabled

Message ID 1483127316-12131-1-git-send-email-martin@martin.st
State Committed
Commit 4e62b57ee03928c12a3119dcaf78ffa1f4d6985f
Headers show

Commit Message

Martin Storsjö Dec. 30, 2016, 7:48 p.m.
When building DLLs with MSVC, CONFIG_STATIC is disabled (see
d66c52c2b3694 for a more verbose explanation) since the built
object files can't be linked statically (which checkasm does).

This worked up until recently, only by luck.
---
 tests/fate/checkasm.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Luca Barbato Dec. 30, 2016, 7:52 p.m. | #1
On 30/12/2016 20:48, Martin Storsjö wrote:
> When building DLLs with MSVC, CONFIG_STATIC is disabled (see
> d66c52c2b3694 for a more verbose explanation) since the built
> object files can't be linked statically (which checkasm does).
> 
> This worked up until recently, only by luck.
> ---
>  tests/fate/checkasm.mak | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
> index 939eb56..5721f1f 100644
> --- a/tests/fate/checkasm.mak
> +++ b/tests/fate/checkasm.mak
> @@ -19,5 +19,5 @@ $(FATE_CHECKASM): tests/checkasm/checkasm$(EXESUF)
>  $(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%)
>  $(FATE_CHECKASM): REF = /dev/null
>  
> -FATE += $(FATE_CHECKASM)
> +FATE-$(CONFIG_STATIC) += $(FATE_CHECKASM)
>  fate-checkasm: $(FATE_CHECKASM)

Ok.

Patch

diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
index 939eb56..5721f1f 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -19,5 +19,5 @@  $(FATE_CHECKASM): tests/checkasm/checkasm$(EXESUF)
 $(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%)
 $(FATE_CHECKASM): REF = /dev/null
 
-FATE += $(FATE_CHECKASM)
+FATE-$(CONFIG_STATIC) += $(FATE_CHECKASM)
 fate-checkasm: $(FATE_CHECKASM)