[nasm:master] test: nasm-t -- Add iftoken

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  2dccd2c276f5794caf60b9a493536b5f6394d34d
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=2dccd2c276f5794caf60b9a493536b5f6394d34d
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 4 Nov 2018 22:41:39 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 11 Nov 2018 21:43:46 +0300

test: nasm-t -- Add iftoken

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 {test => travis/test}/iftoken.asm |  6 ++----
 travis/test/iftoken.bin.t         | 26 ++++++++++++++++++++++++++
 travis/test/iftoken.json          | 11 +++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/test/iftoken.asm b/travis/test/iftoken.asm
similarity index 97%
copy from test/iftoken.asm
copy to travis/test/iftoken.asm
index 7a0fec4..f4e955e 100644
--- a/test/iftoken.asm
+++ b/travis/test/iftoken.asm
@@ -1,15 +1,13 @@
-;Testname=test; Arguments=-fbin -oiftoken.txt; Files=stdout stderr iftoken.txt
-
 %define ZMACRO
 %define NMACRO 1
 %define TMACRO 1 2
 	db 'N "":'
-%iftoken 
+%iftoken
 	db ' token'
 %else
 	db ' ntoken'
 %endif
-%ifempty 
+%ifempty
 	db ' empty'
 %else
 	db ' nempty'
diff --git a/travis/test/iftoken.bin.t b/travis/test/iftoken.bin.t
new file mode 100644
index 0000000..dbc06bb
--- /dev/null
+++ b/travis/test/iftoken.bin.t
@@ -0,0 +1,26 @@
+N "": ntoken empty
+C "": ntoken empty
+N "ZMACRO": ntoken empty
+C "ZMACRO": ntoken empty
+N "NMACRO": token nempty
+C "NMACRO": token nempty
+N "TMACRO": ntoken nempty
+C "TMACRO": ntoken nempty
+N "1": token nempty
+C "1": token nempty
+N "+1": ntoken nempty
+C "+1": ntoken nempty
+N "1 2": ntoken nempty
+C "1 2": ntoken nempty
+N "1,2": ntoken nempty
+C "1,2": ntoken nempty
+N "foo": token nempty
+C "foo": token nempty
+N "foo bar": ntoken nempty
+C "foo bar": ntoken nempty
+N "%": token nempty
+C "%": token nempty
+N "+foo": ntoken nempty
+C "+foo": ntoken nempty
+N "<<": token nempty
+C "<<": token nempty
diff --git a/travis/test/iftoken.json b/travis/test/iftoken.json
new file mode 100644
index 0000000..57ac110
--- /dev/null
+++ b/travis/test/iftoken.json
@@ -0,0 +1,11 @@
+[
+	{
+		"description": "Test iftoken directive",
+		"id": "iftoken",
+		"format": "bin",
+		"source": "iftoken.asm",
+		"target": [
+			{ "output": "iftoken.bin" }
+		]
+	}
+]