utest: rename the ut to the utests

Change-Id: Id22d254e82d3451535a7a665d35afee52a238941

diff --git a/Makefile.am b/Makefile.am
index 8b6604d..c6a6d73 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 
 if HAVE_UTEST
-SUBDIRS = . include protocol common src backends client tools ut
+SUBDIRS = . include protocol common src backends client tools utests
 else
 SUBDIRS = . include protocol common src backends client tools
 endif

diff --git a/configure.ac b/configure.ac
index 40a3816..c55f3fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,11 +31,11 @@ LT_INIT([disable-static])
 # Enable quiet compiles on automake 1.11.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_ARG_WITH(utest, AS_HELP_STRING([--with-utest=yes/no], [whether build/run unit tests or not]),
-                               [ utest="$withval" ],
-                               [ utest="no" ])
+AC_ARG_WITH(utests, AS_HELP_STRING([--with-utests=yes/no], [whether build/run unit tests or not]),
+                               [ utests="$withval" ],
+                               [ utests="no" ])
 
-AM_CONDITIONAL(HAVE_UTEST, test "x$utest" = "xyes")
+AM_CONDITIONAL(HAVE_UTEST, test "x$utests" = "xyes")
 
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
 if test x$wayland_scanner = x; then
@@ -95,7 +95,7 @@ AC_OUTPUT([
        client/libtdm-client.pc
        client/Makefile
        tools/Makefile
-       ut/Makefile])
+       utests/Makefile])
 
 echo ""
 echo "$PACKAGE_STRING will be compiled with:"

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index a21d427..6496af0 100644 (file)
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -1,4 +1,4 @@
-%bcond_with utest
+%define UTEST_PACKAGE 0
 
 Name:           libtdm
 Version:        1.8.2
@@ -44,7 +44,7 @@ Requires:       libtdm-devel
 %description client-devel
 Tizen Display Manager Client Library headers
 
-%if %{with utest}
+%if "%{UTEST_PACKAGE}" == "1"
 %package utests
 Summary: Tizen Display Manager unit tests package
 Group: Development/Libraries
@@ -70,11 +70,11 @@ cp %{SOURCE1001} .
 %build
 UTEST="no"
 
-%if %{with utest}
+%if "%{UTEST_PACKAGE}" == "1"
 UTEST="yes"
 %endif
 
-%reconfigure --disable-static --with-utest=${UTEST} \
+%reconfigure --disable-static --with-utests=${UTEST} \
              CFLAGS="${CFLAGS} -Wall -Werror" \
              LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
 make %{?_smp_mflags}
@@ -140,10 +140,10 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %attr(750,root,root) %{_bindir}/tdm-test-server
 %{_bindir}/tdm-test-client
 
-%if %{with utest}
+%if "%{UTEST_PACKAGE}" == "1"
 %files utests
 %defattr(-,root,root,-)
-%{_bindir}/tdm_utests
+%{_bindir}/tdm-utests
 %endif
 
 %changelog

diff --git a/ut/Makefile.am b/utests/Makefile.am
similarity index 95%
rename from ut/Makefile.am
rename to utests/Makefile.am
index 57dd954..2588801 100644 (file)
--- a/ut/Makefile.am
+++ b/utests/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = tdm_utests
+bin_PROGRAMS = tdm-utests
 
 tdm_utests_SOURCES = \
        src/main_tests.cpp \
@@ -44,4 +44,4 @@ tdm_utests_LDFLAGS = \
        -pthread
 
 check:
-       ./tdm_utests
+       ./tdm-utests

diff --git a/ut/src/main_tests.cpp b/utests/src/main_tests.cpp
similarity index 100%
rename from ut/src/main_tests.cpp
rename to utests/src/main_tests.cpp

diff --git a/ut/src/ut_tdm.cpp b/utests/src/ut_tdm.cpp
similarity index 100%
rename from ut/src/ut_tdm.cpp
rename to utests/src/ut_tdm.cpp

diff --git a/ut/src/ut_tdm_backend.cpp b/utests/src/ut_tdm_backend.cpp
similarity index 100%
rename from ut/src/ut_tdm_backend.cpp
rename to utests/src/ut_tdm_backend.cpp

diff --git a/ut/src/ut_tdm_buffer.cpp b/utests/src/ut_tdm_buffer.cpp
similarity index 100%
rename from ut/src/ut_tdm_buffer.cpp
rename to utests/src/ut_tdm_buffer.cpp

diff --git a/ut/src/ut_tdm_capture.cpp b/utests/src/ut_tdm_capture.cpp
similarity index 100%
rename from ut/src/ut_tdm_capture.cpp
rename to utests/src/ut_tdm_capture.cpp

diff --git a/ut/src/ut_tdm_display.cpp b/utests/src/ut_tdm_display.cpp
similarity index 100%
rename from ut/src/ut_tdm_display.cpp
rename to utests/src/ut_tdm_display.cpp

diff --git a/ut/src/ut_tdm_event_loop.cpp b/utests/src/ut_tdm_event_loop.cpp
similarity index 100%
rename from ut/src/ut_tdm_event_loop.cpp
rename to utests/src/ut_tdm_event_loop.cpp

diff --git a/ut/src/ut_tdm_helper.cpp b/utests/src/ut_tdm_helper.cpp
similarity index 100%
rename from ut/src/ut_tdm_helper.cpp
rename to utests/src/ut_tdm_helper.cpp

diff --git a/ut/src/ut_tdm_pp.cpp b/utests/src/ut_tdm_pp.cpp
similarity index 100%
rename from ut/src/ut_tdm_pp.cpp
rename to utests/src/ut_tdm_pp.cpp

diff --git a/ut/src/ut_tdm_thread.cpp b/utests/src/ut_tdm_thread.cpp
similarity index 100%
rename from ut/src/ut_tdm_thread.cpp
rename to utests/src/ut_tdm_thread.cpp

diff --git a/ut/src/ut_tdm_vblank.cpp b/utests/src/ut_tdm_vblank.cpp
similarity index 100%
rename from ut/src/ut_tdm_vblank.cpp
rename to utests/src/ut_tdm_vblank.cpp

diff --git a/ut/stubs/stub_backend.cpp b/utests/stubs/stub_backend.cpp
similarity index 100%
rename from ut/stubs/stub_backend.cpp
rename to utests/stubs/stub_backend.cpp

diff --git a/ut/stubs/stub_backend.h b/utests/stubs/stub_backend.h
similarity index 100%
rename from ut/stubs/stub_backend.h
rename to utests/stubs/stub_backend.h

diff --git a/ut/stubs/stub_dlfcn.cpp b/utests/stubs/stub_dlfcn.cpp
similarity index 100%
rename from ut/stubs/stub_dlfcn.cpp
rename to utests/stubs/stub_dlfcn.cpp

diff --git a/ut/stubs/stub_dlfcn.h b/utests/stubs/stub_dlfcn.h
similarity index 100%
rename from ut/stubs/stub_dlfcn.h
rename to utests/stubs/stub_dlfcn.h

diff --git a/ut/stubs/stub_fcntl.h b/utests/stubs/stub_fcntl.h
similarity index 100%
rename from ut/stubs/stub_fcntl.h
rename to utests/stubs/stub_fcntl.h

diff --git a/ut/stubs/stub_pthread.cpp b/utests/stubs/stub_pthread.cpp
similarity index 100%
rename from ut/stubs/stub_pthread.cpp
rename to utests/stubs/stub_pthread.cpp

diff --git a/ut/stubs/stub_pthread.h b/utests/stubs/stub_pthread.h
similarity index 100%
rename from ut/stubs/stub_pthread.h
rename to utests/stubs/stub_pthread.h

diff --git a/ut/stubs/stub_stdio.h b/utests/stubs/stub_stdio.h
similarity index 100%
rename from ut/stubs/stub_stdio.h
rename to utests/stubs/stub_stdio.h

diff --git a/ut/stubs/stub_stdlib.cpp b/utests/stubs/stub_stdlib.cpp
similarity index 100%
rename from ut/stubs/stub_stdlib.cpp
rename to utests/stubs/stub_stdlib.cpp

diff --git a/ut/stubs/stub_stdlib.h b/utests/stubs/stub_stdlib.h
similarity index 100%
rename from ut/stubs/stub_stdlib.h
rename to utests/stubs/stub_stdlib.h

diff --git a/ut/stubs/stub_tdm.h b/utests/stubs/stub_tdm.h
similarity index 100%
rename from ut/stubs/stub_tdm.h
rename to utests/stubs/stub_tdm.h

diff --git a/ut/stubs/stub_tdm_buffer.h b/utests/stubs/stub_tdm_buffer.h
similarity index 100%
rename from ut/stubs/stub_tdm_buffer.h
rename to utests/stubs/stub_tdm_buffer.h

diff --git a/ut/stubs/stub_tdm_capture.h b/utests/stubs/stub_tdm_capture.h
similarity index 100%
rename from ut/stubs/stub_tdm_capture.h
rename to utests/stubs/stub_tdm_capture.h

diff --git a/ut/stubs/stub_tdm_display.h b/utests/stubs/stub_tdm_display.h
similarity index 100%
rename from ut/stubs/stub_tdm_display.h
rename to utests/stubs/stub_tdm_display.h

diff --git a/ut/stubs/stub_tdm_event_loop.h b/utests/stubs/stub_tdm_event_loop.h
similarity index 100%
rename from ut/stubs/stub_tdm_event_loop.h
rename to utests/stubs/stub_tdm_event_loop.h

diff --git a/ut/stubs/stub_tdm_helper.h b/utests/stubs/stub_tdm_helper.h
similarity index 100%
rename from ut/stubs/stub_tdm_helper.h
rename to utests/stubs/stub_tdm_helper.h

diff --git a/ut/stubs/stub_tdm_pp.h b/utests/stubs/stub_tdm_pp.h
similarity index 100%
rename from ut/stubs/stub_tdm_pp.h
rename to utests/stubs/stub_tdm_pp.h

diff --git a/ut/stubs/stub_tdm_server.h b/utests/stubs/stub_tdm_server.h
similarity index 100%
rename from ut/stubs/stub_tdm_server.h
rename to utests/stubs/stub_tdm_server.h

diff --git a/ut/stubs/stub_tdm_thread.h b/utests/stubs/stub_tdm_thread.h
similarity index 100%
rename from ut/stubs/stub_tdm_thread.h
rename to utests/stubs/stub_tdm_thread.h

diff --git a/ut/stubs/stub_tdm_vblank.h b/utests/stubs/stub_tdm_vblank.h
similarity index 100%
rename from ut/stubs/stub_tdm_vblank.h
rename to utests/stubs/stub_tdm_vblank.h

diff --git a/ut/stubs/stub_unistd.cpp b/utests/stubs/stub_unistd.cpp
similarity index 100%
rename from ut/stubs/stub_unistd.cpp
rename to utests/stubs/stub_unistd.cpp

diff --git a/ut/stubs/stub_unistd.h b/utests/stubs/stub_unistd.h
similarity index 100%
rename from ut/stubs/stub_unistd.h
rename to utests/stubs/stub_unistd.h

diff --git a/ut/stubs/tbm_bufmgr.h b/utests/stubs/tbm_bufmgr.h
similarity index 100%
rename from ut/stubs/tbm_bufmgr.h
rename to utests/stubs/tbm_bufmgr.h

diff --git a/ut/stubs/tbm_stubs.cpp b/utests/stubs/tbm_stubs.cpp
similarity index 100%
rename from ut/stubs/tbm_stubs.cpp
rename to utests/stubs/tbm_stubs.cpp

diff --git a/ut/stubs/tbm_stubs.h b/utests/stubs/tbm_stubs.h
similarity index 100%
rename from ut/stubs/tbm_stubs.h
rename to utests/stubs/tbm_stubs.h

diff --git a/ut/stubs/tbm_surface.h b/utests/stubs/tbm_surface.h
similarity index 100%
rename from ut/stubs/tbm_surface.h
rename to utests/stubs/tbm_surface.h

diff --git a/ut/stubs/tbm_surface_internal.h b/utests/stubs/tbm_surface_internal.h
similarity index 100%
rename from ut/stubs/tbm_surface_internal.h
rename to utests/stubs/tbm_surface_internal.h

diff --git a/ut/stubs/tbm_surface_queue.h b/utests/stubs/tbm_surface_queue.h
similarity index 100%
rename from ut/stubs/tbm_surface_queue.h
rename to utests/stubs/tbm_surface_queue.h

diff --git a/ut/stubs/tbm_type.h b/utests/stubs/tbm_type.h
similarity index 100%
rename from ut/stubs/tbm_type.h
rename to utests/stubs/tbm_type.h

diff --git a/ut/stubs/tdm_backend_module_subs.cpp b/utests/stubs/tdm_backend_module_subs.cpp
similarity index 100%
rename from ut/stubs/tdm_backend_module_subs.cpp
rename to utests/stubs/tdm_backend_module_subs.cpp

diff --git a/ut/stubs/tdm_event_loop_stubs.h b/utests/stubs/tdm_event_loop_stubs.h
similarity index 100%
rename from ut/stubs/tdm_event_loop_stubs.h
rename to utests/stubs/tdm_event_loop_stubs.h

diff --git a/ut/stubs/tdm_log.cpp b/utests/stubs/tdm_log.cpp
similarity index 100%
rename from ut/stubs/tdm_log.cpp
rename to utests/stubs/tdm_log.cpp

diff --git a/ut/stubs/tdm_server.cpp b/utests/stubs/tdm_server.cpp
similarity index 100%
rename from ut/stubs/tdm_server.cpp
rename to utests/stubs/tdm_server.cpp

diff --git a/ut/stubs/wayland-server-core.h b/utests/stubs/wayland-server-core.h
similarity index 100%
rename from ut/stubs/wayland-server-core.h
rename to utests/stubs/wayland-server-core.h

diff --git a/ut/stubs/wayland-tbm-drm-auth-client-protocol.h b/utests/stubs/wayland-tbm-drm-auth-client-protocol.h
similarity index 100%
rename from ut/stubs/wayland-tbm-drm-auth-client-protocol.h
rename to utests/stubs/wayland-tbm-drm-auth-client-protocol.h