wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-01 05:22:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

test: Only echo last output of command in retry

Browse Source 
Signed-off-by: Jacques de Laval <jacques@de-laval.se>
This commit is contained in:
Jacques de Laval
2021-02-23 00:32:36 +01:00
parent cda90fe5ee
commit 17d0835d63
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/lib.sh
+7 -5
View File
@@ -54,10 +54,13 @@ retry() {
for _ in $(seq 1 "$__retry_n"); do for _ in $(seq 1 "$__retry_n"); do
sleep "$__retry_sleep" sleep "$__retry_sleep"
eval "$__retry_cmd" || continue __retry_cmd_out=$(eval "$__retry_cmd") && \
return 0 echo "$__retry_cmd_out" && \
return 0
done done
eval "$__retry_cmd" __retry_cmd_exit="$?"
echo "$__retry_cmd_out"
return "$__retry_cmd_exit"
} }
say() { say() {
@@ -90,8 +93,7 @@ log "$color_reset" '--' ''
# Setup # Setup
"$TEST_DIR/testenv_start.sh" finit & "$TEST_DIR/testenv_start.sh" finit &
finit_ppid=$! finit_ppid=$!
# shellcheck disable=SC2016 finit_pid=$(retry "pgrep -P $finit_ppid")
retry 'finit_pid=$(pgrep -P '"$finit_ppid"')'
tty=/dev/$(texec cat /sys/class/tty/console/active) tty=/dev/$(texec cat /sys/class/tty/console/active)
texec cat "$tty" & texec cat "$tty" &