From cc249f980b764ff752288ac33ae7d6e09d398db4 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 11 Nov 2019 15:33:34 +0100 Subject: [PATCH] mavsdk_tests: check if build everything is built --- test/mavsdk_tests/mavsdk_test_runner.py | 34 +++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/test/mavsdk_tests/mavsdk_test_runner.py b/test/mavsdk_tests/mavsdk_test_runner.py index 491515408f..7ee978a046 100755 --- a/test/mavsdk_tests/mavsdk_test_runner.py +++ b/test/mavsdk_tests/mavsdk_test_runner.py @@ -139,18 +139,32 @@ class TestRunner(Runner): self.log_prefix = "test_runner" +def is_running(process_name): + for proc in psutil.process_iter(attrs=['name']): + if proc.info['name'] == process_name: + True + return False + + def is_everything_ready(): result = True - for proc in psutil.process_iter(attrs=['name']): - if proc.info['name'] == 'gzserver': - print("gzserver process already running\n" - "run `killall gzserver` and try again") - result = False - elif proc.info['name'] == 'px4': - print("px4 process already running\n" - "run `killall px4` and try again") - result = False - + if is_running('px4'): + print("px4 process already running\n" + "run `killall px4` and try again") + result = False + if is_running('gzserver'): + print("gzserver process already running\n" + "run `killall gzserver` and try again") + result = False + if not os.path.isfile('build/px4_sitl_default/bin/px4'): + print("PX4 SITL is not built\n" + "run `PX4_MAVSDK_TESTING=y DONT_RUN=1 " + "make px4_sitl gazebo mavsdk_tests`") + if not os.path.isfile('build/px4_sitl_default/mavsdk_tests'): + print("Test runner is not built\n" + "run `PX4_MAVSDK_TESTING=y DONT_RUN=1 " + "make px4_sitl gazebo mavsdk_tests`") + result = False return result