utest: change name to unittests

Change-Id: I6384ebfff09694b3aa601128821f40c939d4d015
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 1c6b3c7..7fff03a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 if HAVE_UTEST
-SUBDIRS = src tool utests
+SUBDIRS = src tool unittests
 else
 SUBDIRS = src tool
 endif

diff --git a/configure.ac b/configure.ac
index 9a7c0a6..34ba00f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,11 +11,11 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
-AC_ARG_WITH(utests, AS_HELP_STRING([--with-utests=yes/no], [whether build/run unit tests or not]),
-                               [ utests="$withval" ],
-                               [ utests="no" ])
+AC_ARG_WITH(unittests, AS_HELP_STRING([--with-unittests=yes/no], [whether build/run unit tests or not]),
+                               [ unittests="$withval" ],
+                               [ unittests="no" ])
 
-AM_CONDITIONAL(HAVE_UTEST, test "x$utests" = "xyes")
+AM_CONDITIONAL(HAVE_UTEST, test "x$unittests" = "xyes")
 
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
 if test x$wayland_scanner = x; then
@@ -32,7 +32,7 @@ AC_CONFIG_FILES([
     src/Makefile
     test/Makefile
     tool/Makefile
-    utests/Makefile
+    unittests/Makefile
        wayland-tbm-server.pc
        wayland-tbm-client.pc
 ])

diff --git a/packaging/libwayland-tbm.spec b/packaging/libwayland-tbm.spec
index 5cb7419..6c59ffb 100644 (file)
--- a/packaging/libwayland-tbm.spec
+++ b/packaging/libwayland-tbm.spec
@@ -51,10 +51,10 @@ Requires:   pkgconfig(libtbm)
 Development header files for use with Wayland protocol
 
 %if "%{UTEST_PACKAGE}" == "1"
-%package utests
+%package unittests
 Summary:    Wayland TBM unit test package
 Group:         Graphics & UI Framework/Wayland Window System
-%description utests
+%description unittests
 Test module for testing wayland-tbm APIs
 %endif
 
@@ -77,7 +77,7 @@ CXXFLAGS+=" -fprofile-arcs -ftest-coverage -DTIZEN_TEST_GCOV"
 LDFLAGS+=" -lgcov"
 %endif
 
-%reconfigure --with-utests=${UTEST} \
+%reconfigure --with-unittests=${UTEST} \
              CFLAGS="${CFLAGS} -Wall -Werror" \
              CXXFLAGS="${CXXFLAGS} -Wall -Werror" \
              LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
@@ -116,9 +116,9 @@ rm -rf %{buildroot}
 %doc README TODO
 
 %if "%{UTEST_PACKAGE}" == "1"
-%files utests
+%files unittests
 %defattr(-,root,root,-)
-%{_bindir}/wayland-tbm-utests
+%{_bindir}/wayland-tbm-unittests
 %endif
 
 %changelog

diff --git a/utests/Makefile.am b/unittests/Makefile.am
similarity index 78%
rename from utests/Makefile.am
rename to unittests/Makefile.am
index 9132673..d30af5c 100644 (file)
--- a/utests/Makefile.am
+++ b/unittests/Makefile.am
@@ -1,6 +1,6 @@
-bin_PROGRAMS = wayland-tbm-utests
+bin_PROGRAMS = wayland-tbm-unittests
 
-wayland_tbm_utests_CXXFLAGS = \
+wayland_tbm_unittests_CXXFLAGS = \
        $(CXXFLAGS) \
        $(WL_TBM_COMMON_CFLAGS) \
        $(WL_TBM_CLIENT_CFLAGS) \
@@ -14,7 +14,7 @@ wayland_tbm_utests_CXXFLAGS = \
 # Warnings occur because we build project with g++.
 # In C++ we need to use explicit types conversion.
 
-wayland_tbm_utests_LDFLAGS = \
+wayland_tbm_unittests_LDFLAGS = \
        ${LDFLAGS} \
        $(WL_TBM_COMMON_LIBS) \
        $(WL_TBM_CLIENT_LIBS) \
@@ -23,10 +23,10 @@ wayland_tbm_utests_LDFLAGS = \
        $(top_builddir)/src/libwayland-tbm-server.la \
        -lgtest
 
-wayland_tbm_utests_SOURCES = \
+wayland_tbm_unittests_SOURCES = \
        src/ut_main.cpp \
        src/ut_base.cpp \
        src/ut_wayland_tbm.cpp
 
 check:
-       ./wayland-tbm-utests
+       ./wayland-tbm-unittests

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

diff --git a/utests/src/ut_base.h b/unittests/src/ut_base.h
similarity index 100%
rename from utests/src/ut_base.h
rename to unittests/src/ut_base.h

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

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