summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2011-06-27 12:32:58 +0100
committerRobert Ancell <robert.ancell@canonical.com>2011-06-27 12:32:58 +0100
commit44e7e2c8e28bca5d6f98b1eb52049f03147a3d27 (patch)
tree4604b9ec8c005b41dabe8d02fd83adcb61d4e3d6 /tests
parentaced7af450339014e6e2cb66c0bb251cddd54f9d (diff)
downloadlightdm-44e7e2c8e28bca5d6f98b1eb52049f03147a3d27.tar.gz
Disable the no-config test
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9570afea..1f0c2463 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = src
TESTS = \
test-headless \
- test-no-config \
test-autologin \
test-login-gobject \
test-login-gobject-wrong-password \
@@ -15,6 +14,10 @@ TESTS = \
test-login-gobject-guest-no-setup-script \
test-login-gobject-guest-fail-setup-script
+# Disable no-config script, we can't specify display numbers currently so it
+# conflicts with an existing running X server
+# test-no-config
+
EXTRA_DIST = \
$(TESTS) \
data/passwd.in \