diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-10-02 13:59:16 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-02 22:49:46 +0000 |
| commit | ff7b51f920e1b3ef6ccc3c9eb771d3ca67c8aee1 (patch) | |
| tree | e0afd6887e25e0021dde3dc87fbf3de9756add6a | |
| parent | 482e8e565125cc8f595aa80e8ba08299f9c410fe (diff) | |
Partially re-enable Wireshark tests.
Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris
buildbots run the test script under Xtightvnc, which provides neither of
those. Only enable the tests on Windows and OS X for now.
Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d
Reviewed-on: https://code.wireshark.org/review/4430
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -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 |