aboutsummaryrefslogtreecommitdiffstats
path: root/travis/test
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-09-11 18:27:06 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-09-11 18:27:06 -0700
commited63993519cb308edbd49c40c8f2486947bd35f3 (patch)
treef34514cd6ef31a84ea90ca011fc9a1ebd8a3850e /travis/test
parentdab902cbdc194d55d08a2df14d2f05dd8aa97f32 (diff)
parentd85890aac74040abbddb32052f72eda0f52f4039 (diff)
downloadnasm-ed63993519cb308edbd49c40c8f2486947bd35f3.tar.gz
nasm-ed63993519cb308edbd49c40c8f2486947bd35f3.tar.xz
nasm-ed63993519cb308edbd49c40c8f2486947bd35f3.zip
Merge remote-tracking branch 'github/nasm-2.15.xx'
No conflicts. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'travis/test')
-rw-r--r--travis/test/br3392442.asm4
-rw-r--r--travis/test/br3392442.bin.tbin0 -> 20 bytes
-rw-r--r--travis/test/br3392442.json13
-rw-r--r--travis/test/br3392442.stderr2
-rw-r--r--travis/test/br3392707-error.stderr1
-rw-r--r--travis/test/br3392707.asm23
-rw-r--r--travis/test/br3392707.bin.tbin0 -> 531 bytes
-rw-r--r--travis/test/br3392707.json22
-rw-r--r--travis/test/br3392707.stderr22
-rw-r--r--travis/test/warnstack.json10
10 files changed, 92 insertions, 5 deletions
diff --git a/travis/test/br3392442.asm b/travis/test/br3392442.asm
new file mode 100644
index 00000000..5b19f09e
--- /dev/null
+++ b/travis/test/br3392442.asm
@@ -0,0 +1,4 @@
+ and byte [0], ~80h
+ and byte [0], 0xfff
+ and byte [0], -256
+ and byte [0], -257
diff --git a/travis/test/br3392442.bin.t b/travis/test/br3392442.bin.t
new file mode 100644
index 00000000..c5c9e785
--- /dev/null
+++ b/travis/test/br3392442.bin.t
Binary files differ
diff --git a/travis/test/br3392442.json b/travis/test/br3392442.json
new file mode 100644
index 00000000..c0fd5e12
--- /dev/null
+++ b/travis/test/br3392442.json
@@ -0,0 +1,13 @@
+[
+ {
+ "description": "Test br3392442",
+ "id": "br3392442",
+ "format": "bin",
+ "source": "br3392442.asm",
+ "option": "-Ox",
+ "target": [
+ { "output": "br3392442.bin" },
+ { "stderr": "br3392442.stderr" }
+ ]
+ }
+]
diff --git a/travis/test/br3392442.stderr b/travis/test/br3392442.stderr
new file mode 100644
index 00000000..cce8581a
--- /dev/null
+++ b/travis/test/br3392442.stderr
@@ -0,0 +1,2 @@
+./travis/test/br3392442.asm:2: warning: byte data exceeds bounds [-w+number-overflow]
+./travis/test/br3392442.asm:4: warning: byte data exceeds bounds [-w+number-overflow] \ No newline at end of file
diff --git a/travis/test/br3392707-error.stderr b/travis/test/br3392707-error.stderr
new file mode 100644
index 00000000..837c1842
--- /dev/null
+++ b/travis/test/br3392707-error.stderr
@@ -0,0 +1 @@
+./travis/test/br3392707.asm:6: error: expecting `)' \ No newline at end of file
diff --git a/travis/test/br3392707.asm b/travis/test/br3392707.asm
new file mode 100644
index 00000000..82e1676b
--- /dev/null
+++ b/travis/test/br3392707.asm
@@ -0,0 +1,23 @@
+ bits 32
+
+ db 33
+ db (44)
+%ifdef ERROR
+ db (44,55)
+%endif
+ db %(44.55)
+ db %('XX','YY')
+ db ('AA')
+ db %('BB')
+ db ?
+ db 6 dup (33)
+ db 6 dup (33, 34)
+ db 6 dup (33, 34), 35
+ db 7 dup (99)
+ db 7 dup (?,?)
+ dw byte (?,44)
+
+ dw 0xcc, 4 dup byte ('PQR'), ?, 0xabcd
+
+ dd 16 dup (0xaaaa, ?, 0xbbbbbb)
+ dd 64 dup (?)
diff --git a/travis/test/br3392707.bin.t b/travis/test/br3392707.bin.t
new file mode 100644
index 00000000..59212a9c
--- /dev/null
+++ b/travis/test/br3392707.bin.t
Binary files differ
diff --git a/travis/test/br3392707.json b/travis/test/br3392707.json
new file mode 100644
index 00000000..158d39c9
--- /dev/null
+++ b/travis/test/br3392707.json
@@ -0,0 +1,22 @@
+[
+ {
+ "description": "Test br3392707",
+ "id": "br3392707",
+ "format": "bin",
+ "source": "br3392707.asm",
+ "option": "-Ox",
+ "target": [
+ { "output": "br3392707.bin" },
+ { "stderr": "br3392707.stderr" }
+ ]
+ },
+ {
+ "description": "Test br3392707 (error)",
+ "ref": "br3392707",
+ "option": "-o br3392707.bin -DERROR -Ox",
+ "target": [
+ { "stderr": "br3392707-error.stderr" }
+ ],
+ "error": "expected"
+ }
+]
diff --git a/travis/test/br3392707.stderr b/travis/test/br3392707.stderr
new file mode 100644
index 00000000..50b45dd2
--- /dev/null
+++ b/travis/test/br3392707.stderr
@@ -0,0 +1,22 @@
+./travis/test/br3392707.asm:10: warning: byte data exceeds bounds [-w+number-overflow]
+./travis/test/br3392707.asm:12: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:17: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:18: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:20: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:22: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]
+./travis/test/br3392707.asm:23: warning: uninitialized space declared in .text section: zeroing [-w+zeroing] \ No newline at end of file
diff --git a/travis/test/warnstack.json b/travis/test/warnstack.json
index c462b75b..43dba671 100644
--- a/travis/test/warnstack.json
+++ b/travis/test/warnstack.json
@@ -1,11 +1,11 @@
[
{
"description": "Test warning stack",
- "id": "warnstack",
- "format": "bin",
- "source": "warnstack.asm",
- "option": "-Ox",
- "target": [
+ "id": "warnstack",
+ "format": "bin",
+ "source": "warnstack.asm",
+ "option": "-Ox",
+ "target": [
{ "output": "warnstack.bin" },
{ "stderr": "warnstack.stderr" }
]