diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2018-11-24 17:06:57 +0300 |
---|---|---|
committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2018-11-24 17:06:57 +0300 |
commit | 85261a2b5790d31322eb4ea8228218dc0ad53374 (patch) | |
tree | b90dbee449fa32489e577f381ad8de8eee58788c /travis | |
parent | f6b1720a2d11af83c659e41d988f472f041b0088 (diff) | |
download | nasm-85261a2b5790d31322eb4ea8228218dc0ad53374.tar.gz |
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 <gorcunov@gmail.com>
Diffstat (limited to 'travis')
-rwxr-xr-x | travis/nasm-t.py | 6 | ||||
-rw-r--r-- | travis/test/addr64x.stderr | 2 | ||||
-rw-r--r-- | travis/test/align13.stderr | 2 | ||||
-rw-r--r-- | travis/test/alonesym-obj.obj.t | bin | 1163 -> 1161 bytes | |||
-rw-r--r-- | travis/test/bcd.stderr | 2 | ||||
-rw-r--r-- | travis/test/elif.o.t | bin | 232 -> 230 bytes | |||
-rw-r--r-- | travis/test/obj.o.t | bin | 482 -> 480 bytes | |||
-rw-r--r-- | travis/test/obj.stderr | 2 | ||||
-rw-r--r-- | travis/test/riprel.stderr | 2 | ||||
-rw-r--r-- | travis/test/tmap.o.stderr | 2 | ||||
-rw-r--r-- | travis/test/utf-error.stderr | 2 | ||||
-rw-r--r-- | 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 e925a6ea..7c37bde8 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 5d1b3184..4c53e22d 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 31d6e310..bc2da8c8 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 Binary files differindex 480d5992..99ec34c4 100644 --- a/travis/test/alonesym-obj.obj.t +++ b/travis/test/alonesym-obj.obj.t diff --git a/travis/test/bcd.stderr b/travis/test/bcd.stderr index 01f1b845..9f308462 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 Binary files differindex 8737f853..60336dcd 100644 --- a/travis/test/elif.o.t +++ b/travis/test/elif.o.t diff --git a/travis/test/obj.o.t b/travis/test/obj.o.t Binary files differindex f5c7671f..a91f3ad1 100644 --- a/travis/test/obj.o.t +++ b/travis/test/obj.o.t diff --git a/travis/test/obj.stderr b/travis/test/obj.stderr index 01586d31..7aba8112 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 59c9ff06..df84009c 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 da75c8fb..cf2770e8 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 3f420e3b..07ff4fb8 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 78e91df2..84fb5282 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 |