Skip to content

Commit 494d953

Browse files
author
H. Peter Anvin
committed
travis: fix the masmdisp travis test
The masmdisp travis test incorrectly contained an expectation of error, from the bug fixed in checkin e095943. Fix the test to contain the actually expected output. Signed-off-by: H. Peter Anvin <[email protected]>
1 parent 638d5bc commit 494d953

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

travis/test/masmdisp.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"option": "-Ox",
88
"target": [
99
{ "stderr": "masmdisp.stderr" }
10-
],
11-
"error": "expected"
10+
]
1211
}
1312
]

travis/test/masmdisp.stderr

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
./travis/test/masmdisp.asm:19: error: label `fproc' inconsistently redefined
2-
./travis/test/masmdisp.asm:9: info: label `fproc' originally defined here
3-
./travis/test/masmdisp.asm:28: error: label `nproc' inconsistently redefined
4-
./travis/test/masmdisp.asm:21: info: label `nproc' originally defined here
5-
./travis/test/masmdisp.asm:30: error: label `_TEXT' inconsistently redefined
6-
./travis/test/masmdisp.asm:7: info: label `_TEXT' originally defined here
7-
./travis/test/masmdisp.asm:35: error: label `_DATA' inconsistently redefined
8-
./travis/test/masmdisp.asm:32: info: label `_DATA' originally defined here
1+
./travis/test/masmdisp.asm:11: warning: 64-bit unsigned relocation zero-extended from 32 bits [-w+zext-reloc]
2+
./travis/test/masmdisp.asm:23: warning: 64-bit unsigned relocation zero-extended from 32 bits [-w+zext-reloc]
3+
./travis/test/masmdisp.asm:38: warning: uninitialised space declared in non-BSS section `_BSS': zeroing [-w+zeroing]
4+
./travis/test/masmdisp.asm:39: warning: uninitialised space declared in non-BSS section `_BSS': zeroing [-w+zeroing]

0 commit comments

Comments
 (0)