[nasm:nasm-2.15.xx] travis: fix "warnstack" test

[nasm-bot for H. Peter Anvin (Intel)]

Commit-ID:  7497737aa2ee4cd2e4a8f2f6bafde7719980b488
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=7497737aa2ee4cd2e4a8f2f6bafde7719980b488
Author:     H. Peter Anvin (Intel) <hpa at zytor.com>
AuthorDate: Thu, 27 Aug 2020 12:22:09 -0700
Committer:  H. Peter Anvin (Intel) <hpa at zytor.com>
CommitDate: Thu, 27 Aug 2020 12:22:09 -0700

travis: fix "warnstack" test

The "warnstack" test is supposed to test the warning stack, but the
[warning] directive is never seen in preprocess-only mode, so run it
in -f bin mode.

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


---
 travis/test/{br2222615.bin.t => warnstack.bin.t} |  0
 travis/test/warnstack.json                       | 11 ++++++-----
 travis/test/warnstack.stderr                     |  5 ++---
 travis/test/warnstack.stdout                     |  9 ---------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/travis/test/br2222615.bin.t b/travis/test/warnstack.bin.t
similarity index 100%
copy from travis/test/br2222615.bin.t
copy to travis/test/warnstack.bin.t
diff --git a/travis/test/warnstack.json b/travis/test/warnstack.json
index 18f27fc6..c462b75b 100644
--- a/travis/test/warnstack.json
+++ b/travis/test/warnstack.json
@@ -1,11 +1,12 @@
 [
 	{
 		"description": "Test warning stack",
-		"id": "warnstack",
-		"source": "warnstack.asm",
-		"option": "-E",
-		"target": [
-			{ "stdout": "warnstack.stdout" },
+	        "id": "warnstack",
+	        "format": "bin",
+	        "source": "warnstack.asm",
+	 	"option": "-Ox",
+	    "target": [
+			{ "output": "warnstack.bin" },
 			{ "stderr": "warnstack.stderr" }
 		]
 	}
diff --git a/travis/test/warnstack.stderr b/travis/test/warnstack.stderr
index 91fbf65f..76f81a8f 100644
--- a/travis/test/warnstack.stderr
+++ b/travis/test/warnstack.stderr
@@ -1,5 +1,4 @@
 ./travis/test/warnstack.asm:1: warning: Good warning [-w+user]
-./travis/test/warnstack.asm:4: warning: Bad warning [-w+user]
 ./travis/test/warnstack.asm:6: warning: Good warning [-w+user]
-./travis/test/warnstack.asm:8: warning: Bad warning [-w+user]
-./travis/test/warnstack.asm:10: warning: Good warning [-w+user]
\ No newline at end of file
+./travis/test/warnstack.asm:9: warning: warning stack empty [-w+warn-stack-empty]
+./travis/test/warnstack.asm:10: warning: Good warning [-w+user]
diff --git a/travis/test/warnstack.stdout b/travis/test/warnstack.stdout
deleted file mode 100644
index 51db543c..00000000
--- a/travis/test/warnstack.stdout
+++ /dev/null
@@ -1,9 +0,0 @@
-%line 2+1 ./travis/test/warnstack.asm
- [warning push]
- [warning -user]
-
- [warning pop]
-
- [warning -user]
-
- [warning pop]
\ No newline at end of file