From 4dcf9e095a6cf626e5f93e237198170c617e6d50 Mon Sep 17 00:00:00 2001 From: Marcin Lis Date: Tue, 1 Jul 2014 17:06:21 +0200 Subject: [PATCH] Move generic Sqlite3DBase test files to common part. Prepare DB-test framework for later use in security-manager tests. Change-Id: I9454431db2654adc0019446e08615ae72051a0fd Signed-off-by: Marcin Lis --- tests/common/CMakeLists.txt | 2 ++ tests/{libprivilege-control-tests => }/common/db_sqlite.cpp | 0 tests/{libprivilege-control-tests => }/common/db_sqlite.h | 0 tests/libprivilege-control-tests/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 1 deletion(-) rename tests/{libprivilege-control-tests => }/common/db_sqlite.cpp (100%) rename tests/{libprivilege-control-tests => }/common/db_sqlite.h (100%) diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt index 87c9bcb..53077eb 100644 --- a/tests/common/CMakeLists.txt +++ b/tests/common/CMakeLists.txt @@ -7,6 +7,7 @@ PKG_CHECK_MODULES(COMMON_TARGET_DEP dpl-test-efl dbus-1 dbus-glib-1 + sqlite3 REQUIRED ) @@ -21,6 +22,7 @@ SET(COMMON_TARGET_TEST_SOURCES ${PROJECT_SOURCE_DIR}/tests/common/dbus_access.cpp ${PROJECT_SOURCE_DIR}/tests/common/gdbbacktrace.cpp ${PROJECT_SOURCE_DIR}/tests/common/memory.cpp + ${PROJECT_SOURCE_DIR}/tests/common/db_sqlite.cpp ) #system and local includes diff --git a/tests/libprivilege-control-tests/common/db_sqlite.cpp b/tests/common/db_sqlite.cpp similarity index 100% rename from tests/libprivilege-control-tests/common/db_sqlite.cpp rename to tests/common/db_sqlite.cpp diff --git a/tests/libprivilege-control-tests/common/db_sqlite.h b/tests/common/db_sqlite.h similarity index 100% rename from tests/libprivilege-control-tests/common/db_sqlite.h rename to tests/common/db_sqlite.h diff --git a/tests/libprivilege-control-tests/CMakeLists.txt b/tests/libprivilege-control-tests/CMakeLists.txt index 6ffa49d..ca2afce 100644 --- a/tests/libprivilege-control-tests/CMakeLists.txt +++ b/tests/libprivilege-control-tests/CMakeLists.txt @@ -69,7 +69,6 @@ PKG_CHECK_MODULES(LPC_TARGET_DEP #files to compile SET(LPC_TARGET_TEST_SOURCES - ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/db_sqlite.cpp ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/db.cpp ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/duplicates.cpp ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/libprivilege-control-test.cpp -- 2.7.4