pass: unittest: Change install path and test file name

Change install path and test file name. Tizen 6.5 requires the install
and naming format as  '/usr/bin/hal/[module name]-haltests'.

[Detailed changes]
- /usr/bin/pass_haltests -> /usr/bin/hal/power-haltests
- /usr/bin/pass_gtest    -> /usr/bin/pass-unittests

And replace -ENODEV with -ENOTSUP because hal-api-power uses
the more correct error value of -ENOTSUP.

Change-Id: Ia2c8fd772d10e8b55db4dc66d9ee4f6d2be511e4
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/packaging/pass.spec b/packaging/pass.spec
index cab50e1..6f2f77d 100644 (file)
--- a/packaging/pass.spec
+++ b/packaging/pass.spec
@@ -99,8 +99,8 @@ systemctl daemon-reload
 
 %files -n %{haltest_name}
 %defattr(-,root,root,-)
-%{_bindir}/pass_haltests
+%{_bindir}/hal/power-haltests
 
 %files -n %{unittest_name}
 %defattr(-,root,root,-)
-%{_bindir}/pass_gtest
+%{_bindir}/pass-unittests

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index e2d13d4..bf34e78 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -29,11 +29,16 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
-aux_source_directory(. sources)
-FOREACH(src ${sources})
-       GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
-       MESSAGE("${src_name}")
-       ADD_EXECUTABLE(${src_name} ${SRCS} ${src})
-       TARGET_LINK_LIBRARIES(${src_name} ${gtest_LDFLAGS} ${gtest_pkgs_LDFLAGS} -ldl -L${LIBDIR}/hal)
-       INSTALL(TARGETS ${src_name} DESTINATION bin)
-ENDFOREACH()
+SET(src ${CMAKE_SOURCE_DIR}/unittest/power-haltests.cpp)
+GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+MESSAGE("${src_name}")
+ADD_EXECUTABLE(${src_name} ${SRCS} ${src})
+TARGET_LINK_LIBRARIES(${src_name} ${gtest_LDFLAGS} ${gtest_pkgs_LDFLAGS} -ldl -L${LIBDIR}/hal)
+INSTALL(TARGETS ${src_name} DESTINATION /usr/bin/hal)
+
+SET(src ${CMAKE_SOURCE_DIR}/unittest/pass-unittests.cpp)
+GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
+MESSAGE("${src_name}")
+ADD_EXECUTABLE(${src_name} ${SRCS} ${src})
+TARGET_LINK_LIBRARIES(${src_name} ${gtest_LDFLAGS} ${gtest_pkgs_LDFLAGS} -ldl -L${LIBDIR}/hal)
+INSTALL(TARGETS ${src_name} DESTINATION /usr/bin/)

diff --git a/unittest/pass_gtest.cpp b/unittest/pass-unittests.cpp
similarity index 100%
rename from unittest/pass_gtest.cpp
rename to unittest/pass-unittests.cpp

diff --git a/unittest/pass_haltests.cpp b/unittest/power-haltests.cpp
similarity index 86%
rename from unittest/pass_haltests.cpp
rename to unittest/power-haltests.cpp
index 3cb6f7b..47b7a30 100644 (file)
--- a/unittest/pass_haltests.cpp
+++ b/unittest/power-haltests.cpp
@@ -26,7 +26,7 @@ extern "C" {
 
 using namespace std;
 
-class PowerMgntHalTest : public testing::Test {
+class PowerHaltest : public testing::Test {
        public:
                virtual void SetUp() {}
                virtual void TearDown() {}
@@ -39,12 +39,12 @@ static int haltest_is_failed(struct pass_resource *res, int ret)
        char *res_name = res->config_data.res_name;
        /*
         * If -EPERM, function is not supported according to h/w resource type.
-        * And if -ENODEV, function is not implemented on hal package.
+        * And if -ENOTSUP, function is not implemented on hal package.
         * It means that this function is not necessary on two error case
         * when calling the HAL functions.
         */
        if (ret < 0) {
-               if (ret == -EPERM || ret == -ENODEV)
+               if (ret == -EPERM || ret == -ENOTSUP)
                        return 0;
 
                cout << "Failed to test HAL of '" << res_name << "'" << endl;
@@ -53,7 +53,7 @@ static int haltest_is_failed(struct pass_resource *res, int ret)
        return 0;
 }
 
-TEST_F(PowerMgntHalTest, GetResourceConfig_HandlesValidInput)
+TEST_F(PowerHaltest, GetResourceConfig_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -76,7 +76,7 @@ TEST_F(PowerMgntHalTest, GetResourceConfig_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetCurrGovernor_HandlesValidInput)
+TEST_F(PowerHaltest, GetCurrGovernor_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -92,7 +92,7 @@ TEST_F(PowerMgntHalTest, GetCurrGovernor_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetCurrGovernor_HandlesValidInput)
+TEST_F(PowerHaltest, SetCurrGovernor_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -113,7 +113,7 @@ TEST_F(PowerMgntHalTest, SetCurrGovernor_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetCurrFreq_HandlesValidInput)
+TEST_F(PowerHaltest, GetCurrFreq_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -128,7 +128,7 @@ TEST_F(PowerMgntHalTest, GetCurrFreq_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetMinFreq_HandlesValidInput)
+TEST_F(PowerHaltest, GetMinFreq_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -143,7 +143,7 @@ TEST_F(PowerMgntHalTest, GetMinFreq_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetMinFreq_HandlesValidInput)
+TEST_F(PowerHaltest, SetMinFreq_HandlesValidInput)
 {
        int ret = 0;
        int min_freq = 0;
@@ -166,7 +166,7 @@ TEST_F(PowerMgntHalTest, SetMinFreq_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetMaxFreq_HandlesValidInput)
+TEST_F(PowerHaltest, GetMaxFreq_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -181,7 +181,7 @@ TEST_F(PowerMgntHalTest, GetMaxFreq_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetMaxFreq_HandlesValidInput)
+TEST_F(PowerHaltest, SetMaxFreq_HandlesValidInput)
 {
        int ret = 0;
        int max_freq = 0;
@@ -204,7 +204,7 @@ TEST_F(PowerMgntHalTest, SetMaxFreq_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetAvailableMinFreq_HandlesValidInput)
+TEST_F(PowerHaltest, GetAvailableMinFreq_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -219,7 +219,7 @@ TEST_F(PowerMgntHalTest, GetAvailableMinFreq_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetAvailableMaxFreq_HandlesValidInput)
+TEST_F(PowerHaltest, GetAvailableMaxFreq_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -235,7 +235,7 @@ TEST_F(PowerMgntHalTest, GetAvailableMaxFreq_HandlesValidInput)
 }
 
 
-TEST_F(PowerMgntHalTest, GetUpThreshold_HandlesValidInput)
+TEST_F(PowerHaltest, GetUpThreshold_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -250,7 +250,7 @@ TEST_F(PowerMgntHalTest, GetUpThreshold_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetUpThreshold_HandlesValidInput)
+TEST_F(PowerHaltest, SetUpThreshold_HandlesValidInput)
 {
        int ret = 0;
        int up_threshold = 0;
@@ -273,7 +273,7 @@ TEST_F(PowerMgntHalTest, SetUpThreshold_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetTemperature_HandlesValidInput)
+TEST_F(PowerHaltest, GetTemperature_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -288,7 +288,7 @@ TEST_F(PowerMgntHalTest, GetTemperature_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetTmuPolicy_HandlesValidInput)
+TEST_F(PowerHaltest, GetTmuPolicy_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -304,7 +304,7 @@ TEST_F(PowerMgntHalTest, GetTmuPolicy_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetOnlineState_HandlesValidInput)
+TEST_F(PowerHaltest, GetOnlineState_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i, j;
@@ -325,7 +325,7 @@ TEST_F(PowerMgntHalTest, GetOnlineState_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetOnlineState_HandlesValidInput)
+TEST_F(PowerHaltest, SetOnlineState_HandlesValidInput)
 {
        int ret = 0;
        int online_state = 0;
@@ -351,7 +351,7 @@ TEST_F(PowerMgntHalTest, SetOnlineState_HandlesValidInput)
 }
 
 
-TEST_F(PowerMgntHalTest, GetOnlineMinNum_HandlesValidInput)
+TEST_F(PowerHaltest, GetOnlineMinNum_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -366,7 +366,7 @@ TEST_F(PowerMgntHalTest, GetOnlineMinNum_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetOnlineMinNum_HandlesValidInput)
+TEST_F(PowerHaltest, SetOnlineMinNum_HandlesValidInput)
 {
        int ret = 0;
        int online_min_num = 0;
@@ -389,7 +389,7 @@ TEST_F(PowerMgntHalTest, SetOnlineMinNum_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetOnlineMaxNum_HandlesValidInput)
+TEST_F(PowerHaltest, GetOnlineMaxNum_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -404,7 +404,7 @@ TEST_F(PowerMgntHalTest, GetOnlineMaxNum_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetOnlineMaxNum_HandlesValidInput)
+TEST_F(PowerHaltest, SetOnlineMaxNum_HandlesValidInput)
 {
        int ret = 0;
        int online_max_num = 0;
@@ -427,7 +427,7 @@ TEST_F(PowerMgntHalTest, SetOnlineMaxNum_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, GetFaultAroundBytes_HandlesValidInput)
+TEST_F(PowerHaltest, GetFaultAroundBytes_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -442,7 +442,7 @@ TEST_F(PowerMgntHalTest, GetFaultAroundBytes_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetFaultAroundBytes_HandlesValidInput)
+TEST_F(PowerHaltest, SetFaultAroundBytes_HandlesValidInput)
 {
        int ret = 0;
        int fault_around_bytes = 0;
@@ -465,7 +465,7 @@ TEST_F(PowerMgntHalTest, SetFaultAroundBytes_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, SetPmqosData_HandlesValidInput)
+TEST_F(PowerHaltest, SetPmqosData_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;
@@ -481,7 +481,7 @@ TEST_F(PowerMgntHalTest, SetPmqosData_HandlesValidInput)
        }
 }
 
-TEST_F(PowerMgntHalTest, PutResourceConfig_HandlesValidInput)
+TEST_F(PowerHaltest, PutResourceConfig_HandlesValidInput)
 {
        int ret = 0;
        unsigned int i;