aboutsummaryrefslogtreecommitdiffstats
path: root/travis/test
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2018-11-04 16:50:19 +0300
committerCyrill Gorcunov <gorcunov@gmail.com>2018-11-11 21:43:45 +0300
commit0cbb3df7f46f6d9b93f1fdfcaea203d6cc766d55 (patch)
treed1d8734f3ea2f0e1c77014da5b48450d4ac69e03 /travis/test
parent915767db1770b95de62568f528b9a6ccf82cbe25 (diff)
downloadnasm-0cbb3df7f46f6d9b93f1fdfcaea203d6cc766d55.tar.gz
nasm-0cbb3df7f46f6d9b93f1fdfcaea203d6cc766d55.tar.xz
nasm-0cbb3df7f46f6d9b93f1fdfcaea203d6cc766d55.zip
test: nasm-t -- Add org test
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'travis/test')
-rw-r--r--travis/test/org.asm15
-rw-r--r--travis/test/org.json18
-rw-r--r--travis/test/org.stderr1
3 files changed, 34 insertions, 0 deletions
diff --git a/travis/test/org.asm b/travis/test/org.asm
new file mode 100644
index 00000000..6f1fa81a
--- /dev/null
+++ b/travis/test/org.asm
@@ -0,0 +1,15 @@
+;
+; Simple test of a 64-bit org directive
+;
+ bits 64
+ org 0xffffffffffff0000
+
+hello: jmp there
+ nop
+ nop
+there:
+ add rax,[rsp+rbx]
+ inc eax
+
+ section .data
+there_ptr dq there
diff --git a/travis/test/org.json b/travis/test/org.json
new file mode 100644
index 00000000..aa19a41d
--- /dev/null
+++ b/travis/test/org.json
@@ -0,0 +1,18 @@
+[
+ {
+ "description": "Test org directive error (elf64)",
+ "id": "org",
+ "format": "elf64",
+ "source": "org.asm",
+ "option": "-Ox",
+ "target": [
+ { "stderr": "org.stderr" }
+ ],
+ "error": "expected"
+ },
+ {
+ "description": "Test org directive error (win64)",
+ "ref": "org",
+ "format": "win64"
+ }
+]
diff --git a/travis/test/org.stderr b/travis/test/org.stderr
new file mode 100644
index 00000000..431c1fdd
--- /dev/null
+++ b/travis/test/org.stderr
@@ -0,0 +1 @@
+./travis/test/org.asm:5: error: parser: instruction expected \ No newline at end of file