mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-02-17 17:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

nasm-t: do not strip newlines from output

Browse Source 
Currently we strip newlines from files on read and write
procedures for better diff output, but as being pointed
by hpa@ this makes quite inconvenient to work with tests
in a manual mode.

Thus lets left outputs as is. We have to update all tests
with template outputs since by default output streams are
ending with newline.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2020-09-17 01:23:25 +03:00
parent 2f8a50d11e
commit c2ea414eb3
51 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
travis/nasm-t.py
View File

@ -117,7 +117,7 @@ if args.cmd == None:
def read_stdfile(path):
with open(path, "rb") as f:
data = f.read().decode("utf-8").strip("\n")
data = f.read().decode("utf-8")
f.close()
return data
@ -297,8 +297,8 @@ def show_diff(test, patha, pathb):
pb = run_hexdump(pathb)
if pa == None or pb == None:
return test_fail(test, "Can't create dumps")
sa = pa.stdout.read().decode("utf-8").strip("\n")
sb = pb.stdout.read().decode("utf-8").strip("\n")
sa = pa.stdout.read().decode("utf-8")
sb = pb.stdout.read().decode("utf-8")
print("\t--- hexdump %s" % (patha))
for i in sa.split("\n"):
print("\t%s" % i)
@ -364,8 +364,8 @@ def exec_nasm(desc):
#
# FIXME: For now 4M buffer is enough but
# better provide reading in a cycle.
stderr = pnasm.stderr.read(4194304).decode("utf-8").strip("\n")
stdout = pnasm.stdout.read(4194304).decode("utf-8").strip("\n")
stderr = pnasm.stderr.read(4194304).decode("utf-8")
stdout = pnasm.stdout.read(4194304).decode("utf-8")
pnasm.stdout.close()
pnasm.stderr.close()

2
travis/test/_version.stdout
View File

@ -1 +1 @@
NASM version 2.15rc0 compiled on Nov 3 2018
NASM version 2.15.05 compiled on Sep 17 2020

2
travis/test/addr64x.stderr
View File

@ -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]

2
travis/test/align13.stderr
View File

@ -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

2
travis/test/align13s.stderr
View File

@ -1,3 +1,3 @@
./travis/test/align13s.asm:9: error: segment alignment `13' is not power of two
./travis/test/align13s.asm:12: error: segment alignment `13' is not power of two
./travis/test/align13s.asm:15: error: segment alignment `13' is not power of two
./travis/test/align13s.asm:15: error: segment alignment `13' is not power of two

2
travis/test/aoutso.stderr
View File

@ -1 +1 @@
./travis/test/aoutso.asm:79: warning: label alone on a line without a colon might be in error [-w+label-orphan]
./travis/test/aoutso.asm:79: warning: label alone on a line without a colon might be in error [-w+label-orphan]

2
travis/test/bcd.stderr
View File

@ -1,2 +1,2 @@
./travis/test/bcd.asm:9: warning: packed BCD truncated to 18 digits [-w+other]
./travis/test/bcd.asm:20: warning: packed BCD truncated to 18 digits [-w+other]
./travis/test/bcd.asm:20: warning: packed BCD truncated to 18 digits [-w+other]

2
travis/test/br2222615.stderr
View File

@ -1 +1 @@
./travis/test/br2222615.asm:14: error: `%ifnmacro' expects a macro name
./travis/test/br2222615.asm:14: error: `%ifnmacro' expects a macro name

2
travis/test/br2496848.stderr
View File

@ -22,4 +22,4 @@
./travis/test/br2496848.asm:38: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/br2496848.asm:38: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/br2496848.asm:39: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/br2496848.asm:39: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/br2496848.asm:39: warning: byte data exceeds bounds [-w+number-overflow]

2
travis/test/br3041451.stderr
View File

@ -1,4 +1,4 @@
./travis/test/br3041451.asm:17: warning: negative `%rep' count: -2 [-w+negative-rep]
./travis/test/br3041451.asm:28: warning: negative `%rep' count: -1 [-w+negative-rep]
./travis/test/br3041451.asm:39: warning: negative `%rep' count: -2 [-w+negative-rep]
./travis/test/br3041451.asm:50: warning: negative `%rep' count: -1 [-w+negative-rep]
./travis/test/br3041451.asm:50: warning: negative `%rep' count: -1 [-w+negative-rep]

2
travis/test/br3104312.stderr
View File

@ -1,2 +1,2 @@
./travis/test/br3104312.asm:2: warning: No bug with 8000_0002h [-w+user]
./travis/test/br3104312.asm:8: warning: No bug with 8000_0001h [-w+user]
./travis/test/br3104312.asm:8: warning: No bug with 8000_0001h [-w+user]

2
travis/test/br3200749.stderr
View File

@ -1,2 +1,2 @@
./travis/test/br3200749.asm:4: error: label or instruction expected at start of line
./travis/test/br3200749.asm:6: error: label or instruction expected at start of line
./travis/test/br3200749.asm:6: error: label or instruction expected at start of line

2
travis/test/br3392392.stderr
View File

@ -1 +1 @@
./travis/test/br3392392.asm:14: error: broadcast not allowed with register operand
./travis/test/br3392392.asm:14: error: broadcast not allowed with register operand

2
travis/test/br3392442.stderr
View File

@ -1,2 +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]
./travis/test/br3392442.asm:4: warning: byte data exceeds bounds [-w+number-overflow]

2
travis/test/br3392528.stderr
View File

@ -1,2 +1,2 @@
./travis/test/br3392528.asm:1: error: parameter count `2222222222' is out of bounds [0; 2147483647]
./travis/test/br3392528.asm:1: error: parameter count `222222222211' is out of bounds [0; 2147483647]
./travis/test/br3392528.asm:1: error: parameter count `222222222211' is out of bounds [0; 2147483647]

2
travis/test/br3392707-error.stderr
View File

@ -1 +1 @@
./travis/test/br3392707.asm:6: error: expecting `)'
./travis/test/br3392707.asm:6: error: expecting `)'

2
travis/test/br3392707.stderr
View File

@ -19,4 +19,4 @@
./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]
./travis/test/br3392707.asm:23: warning: uninitialized space declared in .text section: zeroing [-w+zeroing]

2
travis/test/br560575.stderr
View File

@ -1,3 +1,3 @@
./travis/test/br560575.asm:3: error: cannot apply SEG to a non-relocatable value
./travis/test/br560575.asm:4: error: cannot apply SEG to a non-relocatable value
./travis/test/br560575.asm:5: error: cannot apply SEG to a non-relocatable value
./travis/test/br560575.asm:5: error: cannot apply SEG to a non-relocatable value

2
travis/test/clzero.stderr
View File

@ -1,3 +1,3 @@
./travis/test/clzero.asm:7: error: instruction not supported in 16-bit mode
./travis/test/clzero.asm:16: error: instruction not supported in 32-bit mode
./travis/test/clzero.asm:23: error: instruction not supported in 64-bit mode
./travis/test/clzero.asm:23: error: instruction not supported in 64-bit mode

2
travis/test/elfso-o0.stderr
View File

@ -1 +1 @@
./travis/test/elfso.asm:83: warning: label alone on a line without a colon might be in error [-w+label-orphan]
./travis/test/elfso.asm:83: warning: label alone on a line without a colon might be in error [-w+label-orphan]

2
travis/test/elfso-ox.stderr
View File

@ -1 +1 @@
./travis/test/elfso.asm:83: warning: label alone on a line without a colon might be in error [-w+label-orphan]
./travis/test/elfso.asm:83: warning: label alone on a line without a colon might be in error [-w+label-orphan]

2
travis/test/expimp-o0-error.stderr
View File

@ -5,4 +5,4 @@
./travis/test/expimp.asm:59: error: short jump is out of range
./travis/test/expimp.asm:59: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:77: error: short jump is out of range
./travis/test/expimp.asm:77: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:77: warning: byte data exceeds bounds [-w+number-overflow]

2
travis/test/expimp-o0.stderr
View File

@ -1,4 +1,4 @@
./travis/test/expimp.asm:17: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:24: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:31: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:38: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:38: warning: signed byte value exceeds bounds [-w+number-overflow]

2
travis/test/expimp-o1.stderr
View File

@ -1,4 +1,4 @@
./travis/test/expimp.asm:17: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:24: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:31: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:38: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:38: warning: signed byte value exceeds bounds [-w+number-overflow]

2
travis/test/expimp-ox-error.stderr
View File

@ -5,4 +5,4 @@
./travis/test/expimp.asm:59: error: short jump is out of range
./travis/test/expimp.asm:59: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:77: error: short jump is out of range
./travis/test/expimp.asm:77: warning: byte data exceeds bounds [-w+number-overflow]
./travis/test/expimp.asm:77: warning: byte data exceeds bounds [-w+number-overflow]

2
travis/test/floatb.stderr
View File

@ -3,4 +3,4 @@
./travis/test/floatb.asm:53: warning: overflow in floating-point constant [-w+float-overflow]
./travis/test/floatb.asm:54: warning: overflow in floating-point constant [-w+float-overflow]
./travis/test/floatb.asm:55: warning: overflow in floating-point constant [-w+float-overflow]
./travis/test/floatb.asm:56: warning: overflow in floating-point constant [-w+float-overflow]
./travis/test/floatb.asm:56: warning: overflow in floating-point constant [-w+float-overflow]

2
travis/test/fwdoptpp.error.stderr
View File

@ -1 +1 @@
./travis/test/fwdoptpp.asm:142: error: Out of space!
./travis/test/fwdoptpp.asm:142: error: Out of space!

2
travis/test/fwdoptpp.fatal.stderr
View File

@ -1 +1 @@
./travis/test/fwdoptpp.asm:140: fatal: Out of space!
./travis/test/fwdoptpp.asm:140: fatal: Out of space!

2
travis/test/fwdoptpp.warning.stderr
View File

@ -1 +1 @@
./travis/test/fwdoptpp.asm:144: warning: Out of space! [-w+user]
./travis/test/fwdoptpp.asm:144: warning: Out of space! [-w+user]

2
travis/test/gotoff64.stderr
View File

@ -1,4 +1,4 @@
./travis/test/gotoff64.asm:9: error: ELF64 requires ..gotoff references to be qword absolute
./travis/test/gotoff64.asm:10: error: ELF64 requires ..gotoff references to be qword absolute
./travis/test/gotoff64.asm:19: error: ELF64 requires ..gotoff references to be qword
./travis/test/gotoff64.asm:20: error: ELF64 requires ..gotoff references to be qword
./travis/test/gotoff64.asm:20: error: ELF64 requires ..gotoff references to be qword

2
travis/test/ifelse.stderr
View File

@ -1,4 +1,4 @@
./travis/test/ifelse.asm:17: warning: trailing garbage after `%else' ignored [-w+other]
./travis/test/ifelse.asm:19: warning: `%elif' after `%else' ignored [-w+other]
./travis/test/ifelse.asm:26: warning: trailing garbage after `%endif' ignored [-w+other]
./travis/test/ifelse.asm:33: warning: `%else' after `%else' ignored. [-w+other]
./travis/test/ifelse.asm:33: warning: `%else' after `%else' ignored. [-w+other]

2
travis/test/imm64-o0.stderr
View File

@ -13,4 +13,4 @@
./travis/test/imm64.asm:55: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:55: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: dword data exceeds bounds [-w+number-overflow]

2
travis/test/imm64-o1.stderr
View File

@ -13,4 +13,4 @@
./travis/test/imm64.asm:55: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:55: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: dword data exceeds bounds [-w+number-overflow]

2
travis/test/imm64-ox.stderr
View File

@ -13,4 +13,4 @@
./travis/test/imm64.asm:55: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:55: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/imm64.asm:56: warning: dword data exceeds bounds [-w+number-overflow]

2
travis/test/immwarn-o.stderr
View File

@ -7,4 +7,4 @@
./travis/test/immwarn.asm:75: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:75: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:79: warning: signed dword value exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:89: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:89: warning: signed byte value exceeds bounds [-w+number-overflow]

2
travis/test/immwarn.stderr
View File

@ -8,4 +8,4 @@
./travis/test/immwarn.asm:75: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:79: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:79: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:89: warning: signed byte value exceeds bounds [-w+number-overflow]
./travis/test/immwarn.asm:89: warning: signed byte value exceeds bounds [-w+number-overflow]

3
travis/test/mout.stderr
View File

@ -1 +1,2 @@
mout.bin: fatal: more than one output file specified: mout.bin
mout.bin: fatal: more than one output file specified: mout.bin

2
travis/test/movimm-o0.stderr
View File

@ -7,4 +7,4 @@
./travis/test/movimm.asm:11: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:12: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:12: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:15: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:15: warning: dword data exceeds bounds [-w+number-overflow]

2
travis/test/movimm-ox.stderr
View File

@ -7,4 +7,4 @@
./travis/test/movimm.asm:11: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:12: warning: signed dword immediate exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:12: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:15: warning: dword data exceeds bounds [-w+number-overflow]
./travis/test/movimm.asm:15: warning: dword data exceeds bounds [-w+number-overflow]

2
travis/test/obj.stderr
View File

@ -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]

2
travis/test/org.stderr
View File

@ -1 +1 @@
./travis/test/org.asm:5: error: parser: instruction expected
./travis/test/org.asm:5: error: parser: instruction expected

2
travis/test/prefix66.stderr
View File

@ -3,4 +3,4 @@
./travis/test/prefix66.asm:13: warning: invalid operand size prefix [-w+other]
./travis/test/prefix66.asm:16: warning: invalid operand size prefix [-w+other]
./travis/test/prefix66.asm:22: warning: invalid operand size prefix [-w+other]
./travis/test/prefix66.asm:25: warning: invalid operand size prefix [-w+other]
./travis/test/prefix66.asm:25: warning: invalid operand size prefix [-w+other]

2
travis/test/ret-16.stderr
View File

@ -1 +1 @@
./travis/test/ret.asm:18: error: expression syntax error
./travis/test/ret.asm:18: error: expression syntax error

2
travis/test/ret-32.stderr
View File

@ -1 +1 @@
./travis/test/ret.asm:37: error: expression syntax error
./travis/test/ret.asm:37: error: expression syntax error

2
travis/test/ret-64.stderr
View File

@ -1 +1 @@
./travis/test/ret.asm:53: error: expression syntax error
./travis/test/ret.asm:53: error: expression syntax error

2
travis/test/riprel.stderr
View File

@ -11917,4 +11917,4 @@
./travis/test/riprel.asm:5354: warning: displacement size ignored on absolute address [-w+other]
./travis/test/riprel.asm:5354: warning: es segment base generated, but will be ignored in 64-bit mode [-w+other]
./travis/test/riprel.asm:5354: warning: es segment base generated, but will be ignored in 64-bit mode [-w+other]
./travis/test/riprel.asm:5354: warning: displacement size ignored on absolute address [-w+other]
./travis/test/riprel.asm:5354: warning: displacement size ignored on absolute address [-w+other]

2
travis/test/testnos3.stderr
View File

@ -1 +1 @@
./travis/test/testnos3.asm:967: warning: floating-point constant significand contains more than 52 digits [-w+float-toolong]
./travis/test/testnos3.asm:967: warning: floating-point constant significand contains more than 52 digits [-w+float-toolong]

2
travis/test/tmap.stderr
View File

@ -1 +1 @@
./travis/test/tmap.asm:938: warning: label alone on a line without a colon might be in error [-w+label-orphan]
./travis/test/tmap.asm:938: warning: label alone on a line without a colon might be in error [-w+label-orphan]

2
travis/test/v4.stderr
View File

@ -1,3 +1,3 @@
./travis/test/v4.asm:13: error: register set not valid for operand
./travis/test/v4.asm:14: error: invalid register set size
./travis/test/v4.asm:15: error: invalid register set size
./travis/test/v4.asm:15: error: invalid register set size

2
travis/test/vex.stderr
View File

@ -1 +1 @@
./travis/test/vex.asm:8: error: specific encoding scheme not available
./travis/test/vex.asm:8: error: specific encoding scheme not available

2
travis/test/vmread.stderr
View File

@ -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