aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-08-27 12:22:09 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-08-27 12:22:09 -0700
commit7497737aa2ee4cd2e4a8f2f6bafde7719980b488 (patch)
tree944591e8e505f62fa97a15a6a3407e7b8b6aa7c6 /travis
parent48327377bd81d49a6d10ec2ee0c91bb7b64e39e9 (diff)
downloadnasm-7497737aa2ee4cd2e4a8f2f6bafde7719980b488.tar.gz
nasm-7497737aa2ee4cd2e4a8f2f6bafde7719980b488.tar.xz
nasm-7497737aa2ee4cd2e4a8f2f6bafde7719980b488.zip
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@zytor.com>
Diffstat (limited to 'travis')
-rw-r--r--travis/test/warnstack.bin.t0
-rw-r--r--travis/test/warnstack.json11
-rw-r--r--travis/test/warnstack.stderr5
-rw-r--r--travis/test/warnstack.stdout9
4 files changed, 8 insertions, 17 deletions
diff --git a/travis/test/warnstack.bin.t b/travis/test/warnstack.bin.t
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/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