diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-15 15:37:57 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-15 17:09:51 -0700 |
| commit | a9be2d378b7ad84e679a48efa81f42fb54f85d9a (patch) | |
| tree | 587d34728dac3517a213d6d2a9a6ebdecd4e7531 /bindings/c | |
| parent | c99720d29f2ee618cc74c9336d2cd2a26544c020 (diff) | |
| download | external_parameter-framework-a9be2d378b7ad84e679a48efa81f42fb54f85d9a.zip external_parameter-framework-a9be2d378b7ad84e679a48efa81f42fb54f85d9a.tar.gz external_parameter-framework-a9be2d378b7ad84e679a48efa81f42fb54f85d9a.tar.bz2 | |
Drop release v2.6.0+no-stlport
Bug 246391
Change-Id: I662b7b0f90c97cb169978e1b64ad1fe32c440cf5
Signed-off-by: Jean-Michel Trivi <jmtrivi@google.com>
Diffstat (limited to 'bindings/c')
| -rw-r--r-- | bindings/c/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | bindings/c/Test.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt index 36b6aa9..3f00434 100644 --- a/bindings/c/CMakeLists.txt +++ b/bindings/c/CMakeLists.txt @@ -48,6 +48,7 @@ if(BUILD_TESTING) # copy it in a standard location (/usr/include on most linux distribution). find_path(CATCH_HEADER catch.hpp) include_directories(${CATCH_HEADER}) + include_directories("${PROJECT_SOURCE_DIR}/utility") # Add unit test add_executable(cparameterUnitTest Test.cpp) @@ -57,7 +58,7 @@ if(BUILD_TESTING) # proper failure. set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nonnull") - target_link_libraries(cparameterUnitTest cparameter) + target_link_libraries(cparameterUnitTest cparameter pfw_utility) add_test(NAME cparameterUnitTest COMMAND cparameterUnitTest) diff --git a/bindings/c/Test.cpp b/bindings/c/Test.cpp index c450e60..8cbaa90 100644 --- a/bindings/c/Test.cpp +++ b/bindings/c/Test.cpp @@ -29,6 +29,7 @@ */ #include "ParameterFramework.h" +#include "FullIo.hpp" #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() #include <catch.hpp> @@ -84,7 +85,7 @@ struct Test CAPTURE(errno); REQUIRE(mFd != -1); mPath = tmpName; - write(mFd, content.c_str(), content.length()); + REQUIRE(utility::fullWrite(mFd, content.c_str(), content.length())); } ~TmpFile() { CHECK(close(mFd) != -1); |