[nasm:master] travis: fix the masmdisp travis test

[nasm-bot for H. Peter Anvin]

Commit-ID:  494d9531dd3311bfd2c3e672c85418aea07ab441
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=494d9531dd3311bfd2c3e672c85418aea07ab441
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Wed, 7 Dec 2022 09:45:36 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Wed, 7 Dec 2022 09:45:36 -0800

travis: fix the masmdisp travis test

The masmdisp travis test incorrectly contained an expectation of
error, from the bug fixed in checkin
e0959432fe24c597e0bfb07412276f622d93a4b9.

Fix the test to contain the actually expected output.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 travis/test/masmdisp.json   |  3 +--
 travis/test/masmdisp.stderr | 12 ++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/travis/test/masmdisp.json b/travis/test/masmdisp.json
index 1ed7817c..08640f05 100644
--- a/travis/test/masmdisp.json
+++ b/travis/test/masmdisp.json
@@ -7,7 +7,6 @@
 		"option": "-Ox",
 		"target": [
 			{ "stderr": "masmdisp.stderr" }
-		],
-		"error": "expected"
+		]
 	}
 ]
diff --git a/travis/test/masmdisp.stderr b/travis/test/masmdisp.stderr
index 2428dee3..0dfabb08 100644
--- a/travis/test/masmdisp.stderr
+++ b/travis/test/masmdisp.stderr
@@ -1,8 +1,4 @@
-./travis/test/masmdisp.asm:19: error: label `fproc' inconsistently redefined
-./travis/test/masmdisp.asm:9: info: label `fproc' originally defined here
-./travis/test/masmdisp.asm:28: error: label `nproc' inconsistently redefined
-./travis/test/masmdisp.asm:21: info: label `nproc' originally defined here
-./travis/test/masmdisp.asm:30: error: label `_TEXT' inconsistently redefined
-./travis/test/masmdisp.asm:7: info: label `_TEXT' originally defined here
-./travis/test/masmdisp.asm:35: error: label `_DATA' inconsistently redefined
-./travis/test/masmdisp.asm:32: info: label `_DATA' originally defined here
+./travis/test/masmdisp.asm:11: warning: 64-bit unsigned relocation zero-extended from 32 bits [-w+zext-reloc]
+./travis/test/masmdisp.asm:23: warning: 64-bit unsigned relocation zero-extended from 32 bits [-w+zext-reloc]
+./travis/test/masmdisp.asm:38: warning: uninitialised space declared in non-BSS section `_BSS': zeroing [-w+zeroing]
+./travis/test/masmdisp.asm:39: warning: uninitialised space declared in non-BSS section `_BSS': zeroing [-w+zeroing]