mirror of
https://github.com/netwide-assembler/nasm.git
synced 2025-11-08 23:27:15 -05:00
travis: don't stop on failure
Don't stop travis after a single test failure. It is better to run all the tests and get a comprehensive list of failing tests. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
@@ -579,7 +579,7 @@ $(travis_version): version
|
|||||||
printf 'NASM version %s compiled on ?\n' `cat version` > $@
|
printf 'NASM version %s compiled on ?\n' `cat version` > $@
|
||||||
|
|
||||||
travis: $(PROGS) $(travis_version)
|
travis: $(PROGS) $(travis_version)
|
||||||
-$(PYTHON3) travis/nasm-t.py run > travis.log
|
-$(PYTHON3) travis/nasm-t.py run --stop=n > travis.log
|
||||||
@if $(GREP) FAIL travis.log; then exit 1; else \
|
@if $(GREP) FAIL travis.log; then exit 1; else \
|
||||||
echo '=== All tests PASS ==='; fi
|
echo '=== All tests PASS ==='; fi
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ for cmd in ['run']:
|
|||||||
dest = 'test',
|
dest = 'test',
|
||||||
help = 'Run the selected test only',
|
help = 'Run the selected test only',
|
||||||
required = False)
|
required = False)
|
||||||
|
spp.add_argument('--stop',
|
||||||
|
dest = 'stop', default = 'y',
|
||||||
|
help = 'Stop immediately on failure (default "y")',
|
||||||
|
required = False)
|
||||||
|
|
||||||
for cmd in ['new']:
|
for cmd in ['new']:
|
||||||
spp = sp.add_parser(cmd, help = 'Add a new test case')
|
spp = sp.add_parser(cmd, help = 'Add a new test case')
|
||||||
@@ -109,7 +113,7 @@ args = parser.parse_args()
|
|||||||
|
|
||||||
if args.cmd == None:
|
if args.cmd == None:
|
||||||
parser.print_help()
|
parser.print_help()
|
||||||
sys.exit(1)
|
sys.exit(64)
|
||||||
|
|
||||||
def read_stdfile(path):
|
def read_stdfile(path):
|
||||||
with open(path, "rb") as f:
|
with open(path, "rb") as f:
|
||||||
@@ -232,7 +236,7 @@ if args.cmd == 'list':
|
|||||||
def test_abort(test, message):
|
def test_abort(test, message):
|
||||||
print("\t%s: %s" % (test, message))
|
print("\t%s: %s" % (test, message))
|
||||||
print("=== Test %s ABORT ===" % (test))
|
print("=== Test %s ABORT ===" % (test))
|
||||||
sys.exit(1)
|
sys.exit(2)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def test_fail(test, message):
|
def test_fail(test, message):
|
||||||
@@ -556,6 +560,7 @@ if args.cmd == 'new':
|
|||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
if args.cmd == 'run':
|
if args.cmd == 'run':
|
||||||
|
errors = 0
|
||||||
desc_array = []
|
desc_array = []
|
||||||
if args.test == None:
|
if args.test == None:
|
||||||
desc_array = collect_test_desc_from_dir(args.dir)
|
desc_array = collect_test_desc_from_dir(args.dir)
|
||||||
@@ -566,10 +571,14 @@ if args.cmd == 'run':
|
|||||||
|
|
||||||
for desc in desc_array:
|
for desc in desc_array:
|
||||||
if test_run(desc) == False:
|
if test_run(desc) == False:
|
||||||
|
errors = 1;
|
||||||
if 'error' in desc and desc['error'] == 'over':
|
if 'error' in desc and desc['error'] == 'over':
|
||||||
test_over(desc['_test-name'])
|
test_over(desc['_test-name'])
|
||||||
else:
|
else:
|
||||||
|
errors = 1
|
||||||
|
if args.stop == 'y':
|
||||||
test_abort(desc['_test-name'], "Error detected")
|
test_abort(desc['_test-name'], "Error detected")
|
||||||
|
sys.exit(errors)
|
||||||
|
|
||||||
if args.cmd == 'update':
|
if args.cmd == 'update':
|
||||||
desc_array = []
|
desc_array = []
|
||||||
|
|||||||
Reference in New Issue
Block a user