Compare revisions

Povilas Kanapickas · Povilas Kanapickas · Povilas Kanapickas · Povilas Kanapickas · Povilas Kanapickas · Povilas Kanapickas
--- a/tests/common/helpers.cpp
+++ b/tests/common/helpers.cpp
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include "helpers.h"

 #include <math.h>

--- a/tests/common/helpers.h
+++ b/tests/common/helpers.h
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #ifndef _HELPERS_H_
 #define _HELPERS_H_


--- a/tests/common/video-driver-test.h
+++ b/tests/common/video-driver-test.h
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #ifndef _VIDEO_DRIVER_TEST_H_
 #define _VIDEO_DRIVER_TEST_H_


--- a/tests/common/xit-event.h
+++ b/tests/common/xit-event.h
@@ -22,15 +22,12 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <X11/Xlib.h>
-
 #ifndef _XIT_EVENT_H_
 #define _XIT_EVENT_H_

+#include <X11/Xlib.h>
+#include <xorg/gtest/xorg-gtest.h>
+
 /**
 * Usage:
 *   ASSERT_EVENT(XIDeviceEvent, myevent, dpy, GenericEvent, xi2_opcode, XI_ButtonPress);
@@ -89,7 +86,7 @@ public:
 template<typename EventType>
 XITEvent<EventType>::XITEvent(::Display *dpy, int type, int opcode, int evtype)
 {
-    if (!XPending(dpy) && !xorg::testing::XServer::WaitForEventOfType(dpy, type, opcode, evtype)) {
+    if (!xorg::testing::XServer::WaitForEvent(dpy)) {
        ADD_FAILURE() << "Event not received before timeout";
        ev = NULL;
        return;

--- a/tests/common/xit-property.cpp
+++ b/tests/common/xit-property.cpp
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <xit-property.h>

 bool DevicePropertyExists(::Display *dpy, int deviceid, const std::string &propname) {

--- a/tests/common/xit-property.h
+++ b/tests/common/xit-property.h
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #ifndef _ATOM_HELPERS_H_
 #define _ATOM_HELPERS_H_


--- a/tests/common/xit-server-input-test.cpp
+++ b/tests/common/xit-server-input-test.cpp
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <stdexcept>
 #include <xorg/gtest/xorg-gtest.h>


--- a/tests/common/xit-server-input-test.h
+++ b/tests/common/xit-server-input-test.h
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #ifndef _XIT_SERVER_INPUT_TEST_H_
 #define _XIT_SERVER_INPUT_TEST_H_


--- a/tests/common/xit-server-test.cpp
+++ b/tests/common/xit-server-test.cpp
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <fstream>

 #include "xit-server-test.h"

--- a/tests/common/xit-server-test.h
+++ b/tests/common/xit-server-test.h
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef _XIT_SERVER_TEST_H_
 #define _XIT_SERVER_TEST_H_


--- a/tests/common/xit-server.cpp
+++ b/tests/common/xit-server.cpp
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "xit-server.h"
 #include "helpers.h"


--- a/tests/common/xit-server.h
+++ b/tests/common/xit-server.h
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef _XIT_SERVER_H
 #define _XIT_SERVER_H


--- a/tests/common/xorg-conf.cpp
+++ b/tests/common/xorg-conf.cpp
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <fstream>
 #include <sstream>
 #include <unistd.h>

--- a/tests/common/xorg-conf.h
+++ b/tests/common/xorg-conf.h
@@ -22,9 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
 #ifndef _XORGCONFIG_H_
 #define _XORGCONFIG_H_


--- a/tests/input/input-module-load.cpp
+++ b/tests/input/input-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>

--- a/tests/lib/libX11.cpp
+++ b/tests/lib/libX11.cpp
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <linux/input.h>
 #include <xorg/gtest/xorg-gtest.h>


--- a/tests/lib/libXi.cpp
+++ b/tests/lib/libXi.cpp
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <linux/input.h>
 #include <xorg/gtest/xorg-gtest.h>


--- a/tests/server/barriers-common.h
+++ b/tests/server/barriers-common.h
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef _BARRIERS_COMMON_H_
 #define _BARRIERS_COMMON_H_


--- a/tests/server/barriers-devices.cpp
+++ b/tests/server/barriers-devices.cpp
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <xorg/gtest/xorg-gtest.h>

 #include <X11/Xlib.h>
@@ -36,8 +32,6 @@
 #include "barriers-common.h"
 #include "helpers.h"

-#if HAVE_FIXES5
-
 using namespace xorg::testing::inputtest;

 static Bool
@@ -103,4 +97,3 @@ TEST_F(BarrierDevices, BarrierBlocksCorrectDevices)

    XFixesDestroyPointerBarrier (dpy, barrier);
 }
-#endif /* HAVE_FIXES5 */
--- a/tests/server/barriers-directions.cpp
+++ b/tests/server/barriers-directions.cpp
@@ -22,10 +22,6 @@
 *
 */

-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <xorg/gtest/xorg-gtest.h>

 #include <X11/Xlib.h>
@@ -36,8 +32,6 @@
 #include "barriers-common.h"
 #include "helpers.h"

-#if HAVE_FIXES5
-
 class BarrierConstrained : public BarrierTest {};

 #define ASSERT_PTR_POS(x, y)                            \
@@ -426,5 +420,3 @@ TEST_F(BarrierConstrained, HorizontalBarrierBothDirectionsYBlocksNoMotion)

    XFixesDestroyPointerBarrier (dpy, barrier);
 }
-
-#endif /* HAVE_FIXES5 */
No results found