diff options
| -rwxr-xr-x | test/suite-capture.sh | 7 | ||||
| -rwxr-xr-x | test/test.sh | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/test/suite-capture.sh b/test/suite-capture.sh index a0606c0be1..dbb0e4a3d2 100755 --- a/test/suite-capture.sh +++ b/test/suite-capture.sh @@ -418,8 +418,11 @@ wireshark_capture_suite() { # that use Wayland or Mir directly, unless they also depend # on the DISPLAY environment variable. # - if [[ $WS_SYSTEM != Windows && $WS_SYSTEM != Darwin ]] && [ -z "$DISPLAY" ]; then - echo -n ' (X server not available)' + #if [[ $WS_SYSTEM != Windows && $WS_SYSTEM != Darwin ]] && [ -z "$DISPLAY" ]; then + + # Qt requires XKEYBOARD and Xrender, which our buildbots don't provide + if [[ $WS_SYSTEM != "Windows" && $WS_SYSTEM != "Darwin" ]]; then + echo -n " (assuming Xvnc, which doesn't support Xrender)" test_step_skipped return fi diff --git a/test/test.sh b/test/test.sh index a676b1f122..879d720088 100755 --- a/test/test.sh +++ b/test/test.sh @@ -114,7 +114,7 @@ trap test_cleanup EXIT test_step_prerequisites() { NOTFOUND=0 - for i in "$WIRESHARK_GTK" "$TSHARK" "$CAPINFOS" "$DUMPCAP" ; do + for i in "$WIRESHARK" "$WIRESHARK_GTK" "$TSHARK" "$CAPINFOS" "$DUMPCAP" ; do if [ ! -x $i ]; then echo "Couldn't find $i" NOTFOUND=1 |