[nasm:master] test: Use NASM_TEST_RUN environment

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

Commit-ID:  85261a2b5790d31322eb4ea8228218dc0ad53374
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=85261a2b5790d31322eb4ea8228218dc0ad53374
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sat, 24 Nov 2018 17:06:57 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 24 Nov 2018 17:06:57 +0300

test: Use NASM_TEST_RUN environment

To placate false positives in outputs which
writes nasm comment an signature into binary
form.

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


---
 travis/nasm-t.py               |   6 +++---
 travis/test/addr64x.stderr     |   2 +-
 travis/test/align13.stderr     |   2 +-
 travis/test/alonesym-obj.obj.t | Bin 1163 -> 1161 bytes
 travis/test/bcd.stderr         |   2 +-
 travis/test/elif.o.t           | Bin 232 -> 230 bytes
 travis/test/obj.o.t            | Bin 482 -> 480 bytes
 travis/test/obj.stderr         |   2 +-
 travis/test/riprel.stderr      |   2 +-
 travis/test/tmap.o.stderr      |   2 +-
 travis/test/utf-error.stderr   |   2 +-
 travis/test/vmread.stderr      |   2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/travis/nasm-t.py b/travis/nasm-t.py
index e925a6e..7c37bde 100755
--- a/travis/nasm-t.py
+++ b/travis/nasm-t.py
@@ -277,17 +277,17 @@ def exec_nasm(desc):
     print("\tProcessing %s" % (desc['_test-name']))
     opts = [args.nasm] + prepare_run_opts(desc)
 
+    nasm_env = os.environ.copy()
+    nasm_env['NASM_TEST_RUN'] = 'y'
+
     desc_env = desc.get('environ')
     if desc_env:
-        nasm_env = os.environ.copy()
         for i in desc_env:
             v = i.split('=')
             if len(v) == 2:
                 nasm_env[v[0]] = v[1]
             else:
                 nasm_env[v[0]] = None
-    else:
-        nasm_env = None
 
     print("\tExecuting %s" % (" ".join(opts)))
     pnasm = subprocess.Popen(opts,
diff --git a/travis/test/addr64x.stderr b/travis/test/addr64x.stderr
index 5d1b318..4c53e22 100644
--- a/travis/test/addr64x.stderr
+++ b/travis/test/addr64x.stderr
@@ -1,4 +1,4 @@
 ./travis/test/addr64x.asm:5: warning: byte data exceeds bounds [-w+number-overflow]
 ./travis/test/addr64x.asm:5: warning: byte data exceeds bounds [-w+number-overflow]
 ./travis/test/addr64x.asm:6: warning: byte data exceeds bounds [-w+number-overflow]
-./travis/test/addr64x.asm:6: warning: byte data exceeds bounds [-w+number-overflow]
+./travis/test/addr64x.asm:6: warning: byte data exceeds bounds [-w+number-overflow]
\ No newline at end of file
diff --git a/travis/test/align13.stderr b/travis/test/align13.stderr
index 31d6e31..bc2da8c 100644
--- a/travis/test/align13.stderr
+++ b/travis/test/align13.stderr
@@ -1,4 +1,4 @@
 ./travis/test/align13.asm:7: error: segment alignment `13' is not power of two
 ./travis/test/align13.asm:10: error: segment alignment `13' is not power of two
 ./travis/test/align13.asm:13: error: segment alignment `13' is not power of two
-./travis/test/align13.asm:14: error: segment alignment `13' is not power of two
+./travis/test/align13.asm:14: error: segment alignment `13' is not power of two
\ No newline at end of file
diff --git a/travis/test/alonesym-obj.obj.t b/travis/test/alonesym-obj.obj.t
index 480d599..99ec34c 100644
Binary files a/travis/test/alonesym-obj.obj.t and b/travis/test/alonesym-obj.obj.t differ
diff --git a/travis/test/bcd.stderr b/travis/test/bcd.stderr
index 01f1b84..9f30846 100644
--- a/travis/test/bcd.stderr
+++ b/travis/test/bcd.stderr
@@ -1,2 +1,2 @@
 ./travis/test/bcd.asm:9: warning: packed BCD truncated to 18 digits
-./travis/test/bcd.asm:20: warning: packed BCD truncated to 18 digits
+./travis/test/bcd.asm:20: warning: packed BCD truncated to 18 digits
\ No newline at end of file
diff --git a/travis/test/elif.o.t b/travis/test/elif.o.t
index 8737f85..60336dc 100644
Binary files a/travis/test/elif.o.t and b/travis/test/elif.o.t differ
diff --git a/travis/test/obj.o.t b/travis/test/obj.o.t
index f5c7671..a91f3ad 100644
Binary files a/travis/test/obj.o.t and b/travis/test/obj.o.t differ
diff --git a/travis/test/obj.stderr b/travis/test/obj.stderr
index 01586d3..7aba811 100644
--- a/travis/test/obj.stderr
+++ b/travis/test/obj.stderr
@@ -1,3 +1,3 @@
 ./travis/test/obj.asm:70: warning: 32-bit segment relocation zero-extended from 16 bits [-w+zext-reloc]
 ./travis/test/obj.asm:71: warning: 64-bit unsigned relocation zero-extended from 32 bits [-w+zext-reloc]
-./travis/test/obj.asm:71: warning: 64-bit segment relocation zero-extended from 16 bits [-w+zext-reloc]
+./travis/test/obj.asm:71: warning: 64-bit segment relocation zero-extended from 16 bits [-w+zext-reloc]
\ No newline at end of file
diff --git a/travis/test/riprel.stderr b/travis/test/riprel.stderr
index 59c9ff0..df84009 100644
--- a/travis/test/riprel.stderr
+++ b/travis/test/riprel.stderr
@@ -10509,4 +10509,4 @@
 ./travis/test/riprel.asm:5353: warning: es segment base generated, but will be ignored in 64-bit mode
 ./travis/test/riprel.asm:5354: warning: absolute address can not be RIP-relative
 ./travis/test/riprel.asm:5354: warning: es segment base generated, but will be ignored in 64-bit mode
-./travis/test/riprel.asm:5354: warning: es segment base generated, but will be ignored in 64-bit mode
+./travis/test/riprel.asm:5354: warning: es segment base generated, but will be ignored in 64-bit mode
\ No newline at end of file
diff --git a/travis/test/tmap.o.stderr b/travis/test/tmap.o.stderr
index da75c8f..cf2770e 100644
--- a/travis/test/tmap.o.stderr
+++ b/travis/test/tmap.o.stderr
@@ -1 +1 @@
-./travis/test/tmap.asm:938: warning: label alone on a line without a colon might be in error [-w+orphan-labels]
+./travis/test/tmap.asm:938: warning: label alone on a line without a colon might be in error [-w+orphan-labels]
\ No newline at end of file
diff --git a/travis/test/utf-error.stderr b/travis/test/utf-error.stderr
index 3f420e3..07ff4fb 100644
--- a/travis/test/utf-error.stderr
+++ b/travis/test/utf-error.stderr
@@ -15,4 +15,4 @@
 ./travis/test/utf.asm:77: error: unterminated __utf16be__ function
 ./travis/test/utf.asm:77: error: comma expected after operand 2
 ./travis/test/utf.asm:78: error: unterminated __utf16be__ function
-./travis/test/utf.asm:79: error: invalid string for transform
+./travis/test/utf.asm:79: error: invalid string for transform
\ No newline at end of file
diff --git a/travis/test/vmread.stderr b/travis/test/vmread.stderr
index 78e91df..84fb528 100644
--- a/travis/test/vmread.stderr
+++ b/travis/test/vmread.stderr
@@ -3,4 +3,4 @@
 ./travis/test/vmread.asm:19: error: instruction not supported in 64-bit mode
 ./travis/test/vmread.asm:20: error: instruction not supported in 64-bit mode
 ./travis/test/vmread.asm:22: error: invalid combination of opcode and operands
-./travis/test/vmread.asm:23: error: invalid combination of opcode and operands
+./travis/test/vmread.asm:23: error: invalid combination of opcode and operands
\ No newline at end of file