drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[buildcore] Add test-rerun-verbose target

Browse Source
This commit is contained in:
Gary Talent 2021-07-30 19:34:11 -05:00
parent 3e3cfcaf7d
commit 6165f63d09
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deps/buildcore/base.mk vendored
View File

@ -26,7 +26,7 @@ SCRIPTS=${BUILDCORE_PATH}/scripts
SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py
PYBB=${PYTHON3} ${SCRIPTS}/pybb.py PYBB=${PYTHON3} ${SCRIPTS}/pybb.py
CMAKE_BUILD=${PYBB} cmake-build CMAKE_BUILD=${PYBB} cmake-build
CTEST_ALL=${PYBB} ctest-verbose CTEST=${PYBB} ctest-all
RM_RF=${PYBB} rm RM_RF=${PYBB} rm
ifdef USE_VCPKG ifdef USE_VCPKG
ifndef VCPKG_DIR_BASE ifndef VCPKG_DIR_BASE
@ -72,7 +72,10 @@ test: build
${ENV_RUN} ${CMAKE_BUILD} build test ${ENV_RUN} ${CMAKE_BUILD} build test
.PHONY: test-verbose .PHONY: test-verbose
test-verbose: build test-verbose: build
${ENV_RUN} ${CTEST_ALL} build ${ENV_RUN} ${CTEST} build --output-on-failure
.PHONY: test-rerun-verbose
test-rerun-verbose: build
${ENV_RUN} ${CTEST} build --rerun-failed --output-on-failure
.PHONY: devenv-image .PHONY: devenv-image
devenv-image: devenv-image:

15
deps/buildcore/scripts/pybb.py vendored
View File

@ -31,6 +31,7 @@ def cat(path):
def mkdir(path): def mkdir(path):
if not os.path.exists(path) and os.path.isdir(path): if not os.path.exists(path) and os.path.isdir(path):
os.mkdir(path) os.mkdir(path)
return 0
# this exists because Windows is utterly incapable of providing a proper rm -rf # this exists because Windows is utterly incapable of providing a proper rm -rf
@ -39,19 +40,22 @@ def rm(path):
os.remove(path) os.remove(path)
elif os.path.isdir(path): elif os.path.isdir(path):
shutil.rmtree(path) shutil.rmtree(path)
return 0
def ctest_verbose(base_path): def ctest_all():
base_path = sys.argv[2]
if not os.path.isdir(base_path): if not os.path.isdir(base_path):
# nothing to build # no generated projects
return 0 return 0
args = ['ctest', '--output-on-failure'] args = ['ctest'] + sys.argv[3:]
orig_dir = os.getcwd() orig_dir = os.getcwd()
for d in os.listdir(base_path): for d in os.listdir(base_path):
os.chdir(os.path.join(orig_dir, base_path, d)) os.chdir(os.path.join(orig_dir, base_path, d))
err = subprocess.run(args).returncode err = subprocess.run(args).returncode
if err != 0: if err != 0:
return err return err
return 0
def cmake_build(base_path, target): def cmake_build(base_path, target):
@ -65,6 +69,7 @@ def cmake_build(base_path, target):
err = subprocess.run(args).returncode err = subprocess.run(args).returncode
if err != 0: if err != 0:
return err return err
return 0
def main(): def main():
@ -73,8 +78,8 @@ def main():
elif sys.argv[1] == 'rm': elif sys.argv[1] == 'rm':
for i in range(2, len(sys.argv)): for i in range(2, len(sys.argv)):
rm(sys.argv[i]) rm(sys.argv[i])
elif sys.argv[1] == 'ctest-verbose': elif sys.argv[1] == 'ctest-all':
err = ctest_verbose(sys.argv[2]) err = ctest_all()
sys.exit(err) sys.exit(err)
elif sys.argv[1] == 'cmake-build': elif sys.argv[1] == 'cmake-build':
err = cmake_build(sys.argv[2], sys.argv[3] if len(sys.argv) > 3 else None) err = cmake_build(sys.argv[2], sys.argv[3] if len(sys.argv) > 3 else None)