aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan LeSage <allan.lesage@canonical.com>2012-12-18 17:11:13 +0000
committerTarmac <Unknown>2012-12-18 17:11:13 +0000
commitb7c4bed23b243c047559bbd572dd1be0daa5c060 (patch)
tree24aa7dd7a37e3043bef721c9e4c195b3f6af0d54
parent21040fcad5f3a0a808d6a0ac2a9beb4d9e595673 (diff)
parentd5a5d411a76e28ad75bdc06fbbfc6e388d9dcb86 (diff)
downloadayatana-ido-b7c4bed23b243c047559bbd572dd1be0daa5c060.tar.gz
ayatana-ido-b7c4bed23b243c047559bbd572dd1be0daa5c060.tar.bz2
ayatana-ido-b7c4bed23b243c047559bbd572dd1be0daa5c060.zip
Testing with cyphermox--removing the special Xvfb auto_test override appears to resolve flaky tests under Jenkins.
Approved by Mathieu Trudel-Lapierre.
-rw-r--r--debian/changelog8
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules3
3 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 00527e8..9c7f4d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,13 @@ ido (12.10.3-0ubuntu1) UNRELEASED; urgency=low
[ Didier Roche ]
* Automatic snapshot from revision 118 (bootstrap)
- -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 19 Nov 2012 14:00:05 -0500
+ [ Allan LeSage ]
+ * debian/rules:
+ - Remove xvfb auto_test override which caused Jenkins failures.
+ * debian/control:
+ - Remove xvfb from Build-Depends.
+
+ -- Allan LeSage <allan.lesage@canonical.com> Mon, 17 Dec 2012 16:44:20 -0600
ido (12.10.2-0ubuntu1) quantal; urgency=low
diff --git a/debian/control b/debian/control
index d2d85ed..e1689d5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 9),
gnome-common,
libxorg-gtest-dev,
libgtest-dev,
- xvfb,
libglib2.0-dev (>=2.14.0),
libgtk-3-dev (>= 3.0),
gtk-doc-tools,
diff --git a/debian/rules b/debian/rules
index bf038e4..c05f4c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,3 @@ override_dh_autoreconf:
override_dh_install:
find debian/tmp/usr/lib -name *.la -delete
dh_install --fail-missing
-
-override_dh_auto_test:
- xvfb-run dh_auto_test