summaryrefslogtreecommitdiff
path: root/tests/server
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-12-11 16:33:50 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-12-13 15:12:43 +1000
commit45be57ef41d394a519f772e7e455f0821f57fda6 (patch)
tree43819d1472ba641c151f7860330e10254e93c1db /tests/server
parent9ce8fd2a38d5b53b7c44ca730cf847efe82295a3 (diff)
server/barriers: put new barrier code behind ifdef
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'tests/server')
-rw-r--r--tests/server/barriers-notify.cpp3
-rw-r--r--tests/server/barriers-validity.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/server/barriers-notify.cpp b/tests/server/barriers-notify.cpp
index 8ad485a..71486d7 100644
--- a/tests/server/barriers-notify.cpp
+++ b/tests/server/barriers-notify.cpp
@@ -13,6 +13,8 @@
#include "xit-event.h"
#include "helpers.h"
+#if HAVE_XI23
+
using namespace xorg::testing::evemu;
class BarrierNotify : public BarrierTest {};
@@ -786,3 +788,4 @@ TEST_F(BarrierNotify, DoesntReceiveLeaveOnDestroyWhenOutsideHitbox)
XFixesDestroyPointerBarrier(dpy, barrier);
ASSERT_FALSE(xorg::testing::XServer::WaitForEvent(dpy, 500));
}
+#endif
diff --git a/tests/server/barriers-validity.cpp b/tests/server/barriers-validity.cpp
index 52f7662..2d2661c 100644
--- a/tests/server/barriers-validity.cpp
+++ b/tests/server/barriers-validity.cpp
@@ -49,6 +49,7 @@ TEST_F(BarrierSimpleTest, DestroyInvalidBarrier)
ASSERT_ERROR(error, xfixes_error_base + BadBarrier);
}
+#if HAVE_XI23
TEST_F(BarrierSimpleTest, MultipleClientSecurity)
{
XORG_TESTCASE("Ensure that two clients can't delete"
@@ -89,6 +90,7 @@ TEST_F(BarrierSimpleTest, MultipleClientSecurity)
error = ReleaseErrorTrap(dpy2);
ASSERT_ERROR(error, BadAccess);
}
+#endif
TEST_F(BarrierSimpleTest, PixmapsNotAllowed)
{