tests/server/barriers-notify.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <xorg/gtest/xorg-gtest.h>
 
 #include <X11/Xlib.h>
@@ -37,8 +33,6 @@
 #include "xit-event.h"
 #include "helpers.h"
 
-#if HAVE_XI23
-
 using namespace xorg::testing::inputtest;
 
 enum BarrierDeviceTestCombinations {
@@ -1110,4 +1104,3 @@ TEST_F(BarrierMPXTest, BarrierLeaveOnMDDestroyWhenInsideHitbox)
 
     ASSERT_TRUE(NoEventPending(dpy));
 }
-#endif

tests/server/barriers-validity.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <xorg/gtest/xorg-gtest.h>
 
 #include <X11/Xlib.h>
@@ -38,8 +34,6 @@
 #include "barriers-common.h"
 #include "helpers.h"
 
-#if HAVE_FIXES5
-
 class BarrierSimpleTest : public BarrierTest {};
 
 TEST_F(BarrierSimpleTest, CreateAndDestroyBarrier)
@@ -75,7 +69,6 @@ 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"
@@ -116,7 +109,6 @@ TEST_F(BarrierSimpleTest, MultipleClientSecurity)
     error = ReleaseErrorTrap(dpy2);
     ASSERT_ERROR(error, BadAccess);
 }
-#endif
 
 TEST_F(BarrierSimpleTest, PixmapsNotAllowed)
 {
@@ -261,5 +253,3 @@ TEST_P(BarrierConflictingDirections, InvalidConflictingDirectionsBarrier)
     ASSERT_NO_ERROR(error);
 }
 INSTANTIATE_TEST_CASE_P(, BarrierConflictingDirections, INVALID_DIRECTIONS);
-
-#endif /* HAVE_FIXES5 */

tests/server/dga.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <stdexcept>
 #include <tuple>
 

tests/server/grab.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <tuple>
 
 #include <xorg/gtest/xorg-gtest.h>

tests/server/input.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <math.h>
 #include <pixman.h>
 #include <fcntl.h>

tests/server/misc.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <fstream>
 
 #include <xorg/gtest/xorg-gtest.h>

tests/server/multihead.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <iostream>
 #include <fstream>
 #include <stdexcept>

tests/server/touch.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <stdexcept>
 #include <tuple>
 

tests/server/xephyr.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <fstream>
 
 #include <xorg/gtest/xorg-gtest.h>

tests/server/xigrabbutton.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <xorg/gtest/xorg-gtest.h>
 
 #include <X11/Xlib.h>

tests/server/xtest.cpp

@@ -22,10 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <xorg/gtest/xorg-gtest.h>
 
 #include <X11/Xlib.h>

tests/video/video-module-load.cpp

@@ -22,9 +22,6 @@
  *
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <stdexcept>
 #include <fstream>
 #include <xorg/gtest/xorg-gtest.h>