mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-04 21:23:57 +08:00
Tools/HIL/run_nsh_cmd.py: fail if ERROR printed in output
This commit is contained in:
@@ -398,7 +398,7 @@ pipeline {
|
|||||||
steps {
|
steps {
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests" || true'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -543,7 +543,7 @@ pipeline {
|
|||||||
steps {
|
steps {
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests" || true'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -861,12 +861,12 @@ void runTests() {
|
|||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "top once"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "work_queue status"'
|
||||||
|
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander_tests"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "commander_tests" || true'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "controllib_test"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "controllib_test"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "lightware_laser_test"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "lightware_laser_test"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink_tests" || true' // TODO
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink_tests" || true' // TODO
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests"'
|
||||||
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test"'
|
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "uorb_tests latency_test" || true'
|
||||||
|
|
||||||
sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-*`'
|
sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-*`'
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ def do_param_set_cmd(port, baudrate, param_name, param_value):
|
|||||||
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.1, xonxoff=True, rtscts=False, dsrdtr=False)
|
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.1, xonxoff=True, rtscts=False, dsrdtr=False)
|
||||||
|
|
||||||
timeout_start = time.time()
|
timeout_start = time.time()
|
||||||
timeout = 10 # 10 seconds
|
timeout = 30 # 30 seconds
|
||||||
|
|
||||||
# wait for nsh prompt
|
# wait for nsh prompt
|
||||||
while True:
|
while True:
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ def do_nsh_cmd(port, baudrate, cmd):
|
|||||||
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.2, xonxoff=True, rtscts=False, dsrdtr=False)
|
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.2, xonxoff=True, rtscts=False, dsrdtr=False)
|
||||||
|
|
||||||
timeout_start = time.time()
|
timeout_start = time.time()
|
||||||
timeout = 10 # 10 seconds
|
timeout = 30 # 30 seconds
|
||||||
|
|
||||||
# wait for nsh prompt
|
# wait for nsh prompt
|
||||||
while True:
|
while True:
|
||||||
@@ -90,13 +90,19 @@ def do_nsh_cmd(port, baudrate, cmd):
|
|||||||
timeout_start = time.time()
|
timeout_start = time.time()
|
||||||
timeout = 180 # 3 minutes
|
timeout = 180 # 3 minutes
|
||||||
|
|
||||||
|
return_code = 0
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
serial_line = ser.readline().decode("ascii", errors='ignore')
|
serial_line = ser.readline().decode("ascii", errors='ignore')
|
||||||
|
|
||||||
if success_cmd in serial_line:
|
if success_cmd in serial_line:
|
||||||
|
sys.exit(return_code)
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
if len(serial_line) > 0:
|
if len(serial_line) > 0:
|
||||||
|
if "ERROR " in serial_line:
|
||||||
|
return_code = -1
|
||||||
|
|
||||||
print_line(serial_line)
|
print_line(serial_line)
|
||||||
|
|
||||||
if "nsh>" in serial_line:
|
if "nsh>" in serial_line:
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ def do_test(port, baudrate, test_name):
|
|||||||
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.2, xonxoff=True, rtscts=False, dsrdtr=False)
|
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.2, xonxoff=True, rtscts=False, dsrdtr=False)
|
||||||
|
|
||||||
timeout_start = time.time()
|
timeout_start = time.time()
|
||||||
timeout = 10 # 10 seconds
|
timeout = 30 # 30 seconds
|
||||||
|
|
||||||
# wait for nsh prompt
|
# wait for nsh prompt
|
||||||
while True:
|
while True:
|
||||||
|
|||||||
@@ -796,7 +796,7 @@ int uORBTest::UnitTest::test_SubscriptionMulti()
|
|||||||
|
|
||||||
if (sub.get_last_generation() != last_gen + 1) {
|
if (sub.get_last_generation() != last_gen + 1) {
|
||||||
//return test_fail("sub %d generation should be %d + 1, but it's %d", sub_instance, last_gen, sub.get_last_generation());
|
//return test_fail("sub %d generation should be %d + 1, but it's %d", sub_instance, last_gen, sub.get_last_generation());
|
||||||
PX4_ERR("sub %d generation should be %d + 1, but it's %d", sub_instance, last_gen, sub.get_last_generation());
|
PX4_WARN("sub %d generation should be %d + 1, but it's %d", sub_instance, last_gen, sub.get_last_generation());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -560,7 +560,7 @@ MavlinkFTP::_workRead(PayloadHeader *payload)
|
|||||||
|
|
||||||
// We have to test seek past EOF ourselves, lseek will allow seek past EOF
|
// We have to test seek past EOF ourselves, lseek will allow seek past EOF
|
||||||
if (payload->offset >= _session_info.file_size) {
|
if (payload->offset >= _session_info.file_size) {
|
||||||
PX4_ERR("request past EOF");
|
PX4_WARN("request past EOF");
|
||||||
return kErrEOF;
|
return kErrEOF;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user