From bf16907c9d1f75d54dc309c83d509480ba0d3a49 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 15 Oct 2025 22:25:39 -0700 Subject: [PATCH] travis: unbreak the ret.asm test The ret.asm test was broken because the assembly expected -DERROR=1 whereas the run script provided -DERROR, masking all the actual errors... Signed-off-by: H. Peter Anvin (Intel) --- travis/test/ret-16.stderr | 7 ++++++- travis/test/ret-32.stderr | 7 ++++++- travis/test/ret-64.stderr | 3 ++- travis/test/ret.asm | 9 +++------ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/travis/test/ret-16.stderr b/travis/test/ret-16.stderr index 6d901faf..05d97846 100644 --- a/travis/test/ret-16.stderr +++ b/travis/test/ret-16.stderr @@ -1 +1,6 @@ -./travis/test/ret.asm:18: error: expression syntax error +./travis/test/ret.asm:16: error: instruction not supported in 16-bit mode +./travis/test/ret.asm:17: error: instruction not supported in 16-bit mode +./travis/test/ret.asm:18: error: instruction not supported in 16-bit mode +./travis/test/ret.asm:56: error: instruction not supported in 16-bit mode +./travis/test/ret.asm:57: error: instruction not supported in 16-bit mode +./travis/test/ret.asm:58: error: instruction not supported in 16-bit mode diff --git a/travis/test/ret-32.stderr b/travis/test/ret-32.stderr index 1a42014b..0c1ccbbd 100644 --- a/travis/test/ret-32.stderr +++ b/travis/test/ret-32.stderr @@ -1 +1,6 @@ -./travis/test/ret.asm:37: error: expression syntax error +./travis/test/ret.asm:35: error: instruction not supported in 32-bit mode +./travis/test/ret.asm:36: error: instruction not supported in 32-bit mode +./travis/test/ret.asm:37: error: instruction not supported in 32-bit mode +./travis/test/ret.asm:56: error: instruction not supported in 32-bit mode +./travis/test/ret.asm:57: error: instruction not supported in 32-bit mode +./travis/test/ret.asm:58: error: instruction not supported in 32-bit mode diff --git a/travis/test/ret-64.stderr b/travis/test/ret-64.stderr index 47223e27..049f707b 100644 --- a/travis/test/ret-64.stderr +++ b/travis/test/ret-64.stderr @@ -1 +1,2 @@ -./travis/test/ret.asm:53: error: expression syntax error +./travis/test/ret.asm:51: error: instruction not supported in 64-bit mode +./travis/test/ret.asm:52: error: instruction not supported in 64-bit mode diff --git a/travis/test/ret.asm b/travis/test/ret.asm index 0606257e..0a74550f 100644 --- a/travis/test/ret.asm +++ b/travis/test/ret.asm @@ -1,7 +1,4 @@ ;; All the flavors of RET -%ifndef ERROR - %define ERROR 0 -%endif %ifdef TEST_BITS_16 bits 16 @@ -15,7 +12,7 @@ retd retnd retfd -%if ERROR +%ifdef ERROR retq retnq retfq @@ -34,7 +31,7 @@ retd retnd retfd -%if ERROR +%ifdef ERROR retq retnq retfq @@ -50,7 +47,7 @@ retw retnw retfw -%if ERROR +%ifdef ERROR retd retnd %endif