Skip to content

Commit b44ecdd

Browse files
authored
Merge pull request #4290 from grandixximo/halcmd-pacifier-tty
tests/pyvcp: filter the halcmd "Waiting for component" pacifier from result
2 parents 00a9187 + cbd80a0 commit b44ecdd

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

tests/pyvcp/test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
set -e
44

55
xvfb-run halrun -s do-test.hal
6-
sed -i '/mypanel/!d' result
6+
# Ubuntu's xvfb-run merges stderr into stdout, so on a slow machine the
7+
# halcmd "Waiting for component" pacifier can end up in result. Drop it.
8+
sed -i -e '/^Waiting for component/d' -e '/mypanel/!d' result
79

810
exit 0

0 commit comments

Comments
 (0)