Skip to content

Commit 3047a27

Browse files
author
Tom Seddon
committed
Be extra verbose when running macOS tests.
Seems a test timeout doesn't count as failure for --output-on-failure purposes.
1 parent d4230e3 commit 3047a27

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Makefile.osx.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ github_ci_macos_homebrew_ffmpeg:
4949

5050
.PHONY:_github_ci_macos_release
5151
_github_ci_macos_release:
52-
$(PYTHON3) "./etc/release/release.py" --verbose $(TARGET_ARGS) --timestamp=$(shell $(PYTHON3) "./etc/release/release2.py" print-timestamp) --gh-release $(shell $(PYTHON3) "./etc/release/release2.py" print-suffix) --ctest-jobs=1 --ctest-output-on-failure
52+
$(PYTHON3) "./etc/release/release.py" --verbose $(TARGET_ARGS) --timestamp=$(shell $(PYTHON3) "./etc/release/release2.py" print-timestamp) --gh-release $(shell $(PYTHON3) "./etc/release/release2.py" print-suffix) --ctest-jobs=1 --ctest-output-on-failure --ctest-extra-verbose
5353

5454
.PHONY:github_ci_macos_x64
5555
github_ci_macos_x64:

etc/release/release.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ def get_ctest_args(options):
164164
args+=['--timeout',str(options.ctest_timeout)]
165165

166166
if options.ctest_output_on_failure: args+=['--output-on-failure']
167+
if options.ctest_extra_verbose: args+=['--extra-verbose']
167168

168169
return args
169170

@@ -543,6 +544,7 @@ def timestamp(x): return datetime.datetime.strptime(x,"%Y%m%d-%H%M%S")
543544
parser.add_argument('--ctest-jobs',metavar='N',default=multiprocessing.cpu_count(),type=int,help='''run %(metavar)s ctest jobs at once. Default: %(default)d''')
544545
parser.add_argument('--ctest-timeout',metavar='SECONDS',default=3*60.0,type=float,help='''test timeout in seconds. Default: %(default)f''')
545546
parser.add_argument('--ctest-output-on-failure',action='store_true',help='''output anything printed by the test program if the test fails''')
547+
parser.add_argument('--ctest-extra-verbose',action='store_true',help='''enable more verbose output from tests''')
546548

547549
if sys.platform=='win32':
548550
parser.add_argument('-t','--toolchain',default='vs2022',help='''Specify toolchain: vs2019, or vs2022. Default: %(default)s''')

0 commit comments

Comments
 (0)