summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt3
-rw-r--r--README.md3
-rw-r--r--parameter/CMakeLists.txt3
-rw-r--r--test/test-fixed-point-parameter/CMakeLists.txt37
-rw-r--r--test/test-platform/TestPlatform.cpp3
5 files changed, 46 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5267e73..1c1c5cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,10 @@ add_subdirectory(utility)
add_subdirectory(remote-processor)
add_subdirectory(remote-process)
+
+enable_testing()
add_subdirectory(test/test-platform)
+add_subdirectory(test/test-fixed-point-parameter)
add_subdirectory(tools/xmlGenerator)
add_subdirectory(tools/xmlValidator)
diff --git a/README.md b/README.md
index a02c1e1..5b0aa2c 100644
--- a/README.md
+++ b/README.md
@@ -73,3 +73,6 @@ Also, CMake can build a project out-of-tree, which is the recommended method:
cd /path/to/build/directory
cmake /path/to/parameter-framework/sources
make
+
+After an install you may want to run the parameter-framework tests with
+`make test`.
diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt
index 7d91a82..9f93da7 100644
--- a/parameter/CMakeLists.txt
+++ b/parameter/CMakeLists.txt
@@ -109,7 +109,8 @@ include_directories(
"${PROJECT_SOURCE_DIR}/remote-processor")
# No need to link with libremote-processor: it is accessed via dlopen()
-target_link_libraries(parameter xmlserializer pfw_utility)
+find_library(dl dl)
+target_link_libraries(parameter xmlserializer pfw_utility dl)
install(TARGETS parameter LIBRARY DESTINATION lib)
# Client headers
diff --git a/test/test-fixed-point-parameter/CMakeLists.txt b/test/test-fixed-point-parameter/CMakeLists.txt
new file mode 100644
index 0000000..44410b0
--- /dev/null
+++ b/test/test-fixed-point-parameter/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Copyright (c) 2014, Intel Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation and/or
+# other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_program(python2 python2)
+
+if(python2)
+ add_test(NAME fix_point_parameter
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND ${python2} Main.py)
+else(python2)
+ message(WARNING "Disabling fix point parameter test as python2 is not installed.")
+endif(python2)
diff --git a/test/test-platform/TestPlatform.cpp b/test/test-platform/TestPlatform.cpp
index f1e99b6..b2b895c 100644
--- a/test/test-platform/TestPlatform.cpp
+++ b/test/test-platform/TestPlatform.cpp
@@ -245,11 +245,10 @@ CTestPlatform::CommandReturn CTestPlatform::getter(
const IRemoteCommand& remoteCommand, string& strResult)
{
(void)remoteCommand;
- (void)strResult;
strResult = (_pParameterMgrPlatformConnector->*getFunction)() ? "true" : "false";
- return CTestPlatform::CCommandHandler::EDone;
+ return CTestPlatform::CCommandHandler::ESucceeded;
}
CTestPlatform::CommandReturn CTestPlatform::setCriterionState(