KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request 'display run commands in helper script' (#564) from eive/fsfw:mueller/update-helper-script into development

Browse Source 
Reviewed-on: fsfw/fsfw#564
This commit is contained in:
Steffen Gaisser 2022-02-28 15:13:39 +01:00
commit a8426750f2
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/helper.py
View File

@ -97,11 +97,11 @@ def handle_docs_type(args, build_dir_list: list):
build_directory = determine_build_dir(build_dir_list) build_directory = determine_build_dir(build_dir_list)
os.chdir(build_directory) os.chdir(build_directory)
if args.build: if args.build:
os.system("cmake --build . -j") cmd_runner("cmake --build . -j")
if args.open: if args.open:
if not os.path.isfile("docs/sphinx/index.html"): if not os.path.isfile("docs/sphinx/index.html"):
# try again.. # try again..
os.system("cmake --build . -j") cmd_runner("cmake --build . -j")
if not os.path.isfile("docs/sphinx/index.html"): if not os.path.isfile("docs/sphinx/index.html"):
print( print(
"No Sphinx documentation file detected. " "No Sphinx documentation file detected. "
@ -147,21 +147,21 @@ def handle_tests_type(args, build_dir_list: list):
# If we are in a different directory we try to switch into it but # If we are in a different directory we try to switch into it but
# this might fail # this might fail
os.chdir(UNITTEST_FOLDER_NAME) os.chdir(UNITTEST_FOLDER_NAME)
os.system("valgrind --leak-check=full ./fsfw-tests") cmd_runner("valgrind --leak-check=full ./fsfw-tests")
os.chdir("..") os.chdir("..")
def create_tests_build_cfg(): def create_tests_build_cfg():
os.mkdir(UNITTEST_FOLDER_NAME) os.mkdir(UNITTEST_FOLDER_NAME)
os.chdir(UNITTEST_FOLDER_NAME) os.chdir(UNITTEST_FOLDER_NAME)
os.system("cmake -DFSFW_OSAL=host -DFSFW_BUILD_UNITTESTS=ON ..") cmd_runner("cmake -DFSFW_OSAL=host -DFSFW_BUILD_UNITTESTS=ON ..")
os.chdir("..") os.chdir("..")
def create_docs_build_cfg(): def create_docs_build_cfg():
os.mkdir(DOCS_FOLDER_NAME) os.mkdir(DOCS_FOLDER_NAME)
os.chdir(DOCS_FOLDER_NAME) os.chdir(DOCS_FOLDER_NAME)
os.system("cmake -DFSFW_OSAL=host -DFSFW_BUILD_DOCS=ON ..") cmd_runner("cmake -DFSFW_OSAL=host -DFSFW_BUILD_DOCS=ON ..")
os.chdir("..") os.chdir("..")
@ -184,7 +184,7 @@ def check_for_cmake_build_dir(build_dir_list: list) -> list:
def perform_lcov_operation(directory: str, chdir: bool): def perform_lcov_operation(directory: str, chdir: bool):
if chdir: if chdir:
os.chdir(directory) os.chdir(directory)
os.system("cmake --build . -- fsfw-tests_coverage -j") cmd_runner("cmake --build . -- fsfw-tests_coverage -j")
def determine_build_dir(build_dir_list: List[str]): def determine_build_dir(build_dir_list: List[str]):
@ -206,5 +206,10 @@ def determine_build_dir(build_dir_list: List[str]):
return build_directory return build_directory
def cmd_runner(cmd: str):
print(f"Executing command: {cmd}")
os.system(cmd)
if __name__ == "__main__": if __name__ == "__main__":
main() main()