removed checking of the window system because wayland is default.

Change-Id: I7ab59a6999162d8a1f4e092a8dcccace025e211d

diff --git a/configure.ac b/configure.ac
index 4390dd57469c104a25def3f4be70e2e80922dddf..be1c478aa8eb5868d9ff4b72e7eb2f7e75c39d34 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,38 +20,14 @@ AC_USE_SYSTEM_EXTENSIONS
 AM_PROG_CC_STDC
 AM_PROG_CC_C_O
 
-## X11
-AC_ARG_WITH([x11],
-            AC_HELP_STRING([--with-x11], [use x11]),
-            [WITH_X="yes"
-            AC_SUBST([WITH_X])], [WITH_X="no"])
-if test "x${WITH_X}" = x"yes"; then
-  AC_DEFINE_UNQUOTED([HAVE_X],[1],[define HAVE_X])
-fi
-AM_CONDITIONAL(HAVE_X, [test "${WITH_X}" = x"yes"])
-
-## Wayland
-AC_ARG_WITH([wayland],
-            AC_HELP_STRING([--with-wayland], [use wayland]),
-            [WITH_WAYLAND="yes"
-             AC_SUBST([WIHT_WAYLAND])], [WITH_WAYLAND="no"])
-if test "x${WITH_WAYLAND}" = x"yes"; then
-  AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[define HAVE_WAYLAND])
-fi
-AM_CONDITIONAL(HAVE_WAYLAND, [test "${WITH_WAYLAND}" = x"yes"])
-
 requirements="\
    elementary \
    eldbus \
    enlightenment \
-   capi-ui-efl-util"
-
-if test "x$WITH_WAYLAND" = x"yes"; then
-requirements="$requirements \
-              wayland-client \
-              ecore-wayland \
-              tizen-extension-client"
-fi
+   capi-ui-efl-util \
+   wayland-client \
+   ecore-wayland \
+   tizen-extension-client"
 
 PKG_CHECK_MODULES(E_TEST_RUNNER, [${requirements}])
 

diff --git a/packaging/e-tizen-testcase.spec b/packaging/e-tizen-testcase.spec
index 7b7fb999bdeb05ca1a35b3ad512c1b8ddcfc58ea..50cedd25b6a4e2c12a05df4a60f8ba0df7749aee 100644 (file)
--- a/packaging/e-tizen-testcase.spec
+++ b/packaging/e-tizen-testcase.spec
@@ -1,6 +1,3 @@
-%bcond_with wayland
-%bcond_with x
-
 Name: e-tizen-testcase
 Version: 0.0.7
 Release: 1
@@ -13,9 +10,7 @@ BuildRequires: pkgconfig(enlightenment)
 BuildRequires: pkgconfig(eldbus)
 BuildRequires: pkgconfig(capi-ui-efl-util)
 BuildRequires: gettext
-%if %{with wayland}
 BuildRequires: pkgconfig(tizen-extension-client)
-%endif
 
 %global TZ_SYS_RO_SHARE  %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share}
 
@@ -32,13 +27,7 @@ export CFLAGS+=" -Wall -g -fPIC -rdynamic ${GC_SECTIONS_FLAGS}"
 export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
 
 %autogen
-%configure --prefix=/usr \
-%if %{with x}
-      --with-x11
-%endif
-%if %{with wayland}
-      --with-wayland
-%endif
+%configure --prefix=/usr
 make %{?_smp_mflags}
 
 %install

diff --git a/src/e_test_runner.c b/src/e_test_runner.c
index 1ea4c6623902971ab114ec75b251a4becefd2397..537caa84fc2e6147b014d92ebd9966b92688a30f 100644 (file)
--- a/src/e_test_runner.c
+++ b/src/e_test_runner.c
@@ -4,7 +4,6 @@
 
 int _log_dom = -1;
 
-#if HAVE_WAYLAND
 struct tizen_policy *tizen_policy = NULL;
 struct tizen_surface *tizen_surface = NULL;
 
@@ -24,12 +23,10 @@ static const struct tizen_resource_listener _tizen_resource_listener =
 {
    _e_test_runner_cb_resource_id,
 };
-#endif
 
 static Ecore_Window
 _e_test_runner_window_id_get(Evas_Object *elm_win)
 {
-#if HAVE_WAYLAND
    Ecore_Wl_Window *wlwin;
    struct wl_surface *surf;
    Ecore_Window id = 0;
@@ -77,9 +74,6 @@ _e_test_runner_window_id_get(Evas_Object *elm_win)
    if (tizen_resource) tizen_resource_destroy(tizen_resource);
 
    return id;
-#else
-   return elm_win_window_id_get(elm_win);
-#endif
 }
 
 static void
@@ -541,7 +535,6 @@ e_tc_win_hide(E_TC_Win *tw)
 Eina_Bool
 e_tc_win_transient_for_set(E_TC_Win *tw_child, E_TC_Win *tw_parent, Eina_Bool set)
 {
-#if HAVE_WAYLAND
    Eina_Inlist *globals;
    Ecore_Wl_Global *global;
    struct wl_registry *registry;
@@ -573,13 +566,6 @@ e_tc_win_transient_for_set(E_TC_Win *tw_child, E_TC_Win *tw_parent, Eina_Bool se
    else
      tizen_policy_unset_transient_for(tizen_policy,
                                     tw_child->native_win);
-#else
-   if (set)
-     ecore_x_icccm_transient_for_set(tw_child->native_win,
-                                     tw_parent->native_win);
-   else
-     ecore_x_icccm_transient_for_unset(tw_child->native_win);
-#endif
    return EINA_TRUE;
 }
 
@@ -658,13 +644,11 @@ _e_test_runner_shutdown(E_Test_Runner *runner)
         E_FREE(tc);
      }
 
-#if HAVE_WAYLAND
    if (tizen_surface) tizen_surface_destroy(tizen_surface);
    if (tizen_policy) tizen_policy_destroy(tizen_policy);
 
    tizen_surface = NULL;
    tizen_policy = NULL;
-#endif
 }
 
 static void

diff --git a/src/e_test_runner.h b/src/e_test_runner.h
index ef0d6843d125439a940cbcdea98b661b8f137735..c9b0c4956e8fee6e42e344dd165cf7b2bce40c25 100644 (file)
--- a/src/e_test_runner.h
+++ b/src/e_test_runner.h
@@ -4,14 +4,9 @@
 #include "config.h"
 #include <Eldbus.h>
 #include <Elementary.h>
-
-#if HAVE_WAYLAND
- #include <Ecore_Wayland.h>
- #include <wayland-client.h>
- #include <tizen-extension-client-protocol.h>
-#else
- #include <Ecore_X.h>
-#endif
+#include <Ecore_Wayland.h>
+#include <wayland-client.h>
+#include <tizen-extension-client-protocol.h>
 
 extern int _log_dom;