apport-hackers team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/apport/skip-kde-tests into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)

For more details, see:
https://code.launchpad.net/~mterry/apport/skip-kde-tests/+merge/116703

This branch does two things:

1) If NOXVFB is requested, actually skip the UI tests, instead of just failing them because xvfb isn't present.  This has the nice side effect of letting the ubuntu package's auto_test command pass again.  (I'm assuming the flag originally was so that you could run the tests in your existing X display?  I figure that skipping is a more useful side effect of the flag, since I'm not sure why you want to use your native X display.)

2) If NOKDE is requested, skip the KDE test.  This is so that the ubuntu package can avoid running the KDE tests during build and thus avoid pulling in KDE build dependencies.

A ubuntu package branch is coming too.
-- 
https://code.launchpad.net/~mterry/apport/skip-kde-tests/+merge/116703
Your team Apport upstream developers is requested to review the proposed merge of lp:~mterry/apport/skip-kde-tests into lp:apport.

=== modified file 'test/run'
--- test/run	2012-07-12 15:11:48 +0000
+++ test/run	2012-07-25 17:21:27 +0000
@@ -80,7 +80,7 @@
 unset DBUS_SESSION_BUS_ADDRESS
 
 xvfb=
-if type xvfb-run >/dev/null && [ -z "$APPORT_TEST_NOXVFB" ]; then
+if type xvfb-run >/dev/null; then
     xvfb=xvfb-run
 fi
 
@@ -104,6 +104,10 @@
 for t in $TESTS; do
     echo "--- Testing $t ---"
     if [ "${t#ui_}" != $t ]; then
+        if [ -n "$APPORT_TEST_NOXVFB" ]; then
+            echo "Skipping UI test"
+            continue
+        fi
         while [ -e /tmp/.X99-lock ]; do
            echo "Waiting for previous xvfb to finish..."
            sleep 0.5
@@ -113,6 +117,10 @@
         # ensure that non-UI modules do not require X
         prefix="env -u DISPLAY"
     fi
+    if [ "${t%_kde}" != $t ] && [ -n "$APPORT_TEST_NOKDE" ]; then
+        echo "Skipping KDE test"
+        continue
+    fi
     if [ "$t" = "python_crashes" ]; then
         prefix="dbus-launch $prefix"
     fi