Build scripts fix.

diff --git a/network-manager/CMakeLists.txt b/network-manager/CMakeLists.txt
index 6f86b72..11422b7 100644 (file)
--- a/network-manager/CMakeLists.txt
+++ b/network-manager/CMakeLists.txt
@@ -10,7 +10,7 @@ if (NOT DEFINED LIBDIR)
 endif (NOT DEFINED LIBDIR)
 
 if (NOT DEFINED TESTS_DIR)
-    SET (TESTS_DIR "/opt/usr/apps/network-manager")
+    SET (TESTS_DIR "/usr/apps/network-manager")
 endif (NOT DEFINED TESTS_DIR)
 
 add_subdirectory(nmlib)

diff --git a/network-manager/nmlib/REST/src/rest_helper.cpp b/network-manager/nmlib/REST/src/rest_helper.cpp
index 020496e..d1f1c45 100644 (file)
--- a/network-manager/nmlib/REST/src/rest_helper.cpp
+++ b/network-manager/nmlib/REST/src/rest_helper.cpp
@@ -128,7 +128,8 @@ RestHelper::ProcessRequest(const Params& params, const std::string& uri)
 
     if (res != CURLE_OK)
     {
-        throw std::runtime_error("cURL perform request error!");
+        std::string err("cURL perform request error: ");
+        throw std::runtime_error(err + curl_easy_strerror(res));
     }
 
     long code;

diff --git a/network-manager/packaging/ioswsec.spec b/network-manager/packaging/ioswsec.spec
index c1b7d50..ddedf90 100644 (file)
--- a/network-manager/packaging/ioswsec.spec
+++ b/network-manager/packaging/ioswsec.spec
@@ -8,12 +8,21 @@ Source0:    %{name}-%{version}.tar.gz
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(libcurl)
+%ifarch armv7l
+BuildRequires: pkgconfig(gtest_gmock)
+%else
 BuildRequires: gtest
 BuildRequires: gtest-devel
-#BuildRequires: pkgconfig(gtest_gmock)
+%endif
 
-%define _tests_dir /opt/usr/apps/network-manager
+
+%define _tests_dir /usr/apps/network-manager
 %define _manifestdir /usr/share/packages
+%ifarch armv7l
+%define _gtest_lib gtest_gmock
+%else
+%define _gtest_lib gtest
+%endif
 
 %description
 Network manager project
@@ -24,7 +33,9 @@ Network manager project
 %build
 cmake . \
     -DLIB_INSTALL_DIR=%{_libdir} \
-    -DMANIFESTDIR=%{_manifestdir}
+    -DMANIFESTDIR=%{_manifestdir} \
+    -DTESTS_DIR=%{_tests_dir} \
+    -DGTEST_LIB=%{_gtest_lib}
 make %{?jobs:-j%jobs} VERBOSE=1
 
 %install

diff --git a/network-manager/scripts/build-KantM-TV-gbs.sh b/network-manager/scripts/build-KantM-TV-gbs.sh
index 17fd23f..cfbbe56 100755 (executable)
--- a/network-manager/scripts/build-KantM-TV-gbs.sh
+++ b/network-manager/scripts/build-KantM-TV-gbs.sh
@@ -20,6 +20,7 @@ function cleanup() {
 }
 
 gbs --conf ${SCRIPT_DIR}/gbs.conf build -P profile.Main2017_KantM -A armv7l --include-all --threads 1 --define '__debug_install_post %{nil}' --define 'debug_package %{nil}'
+#gbs --conf ${SCRIPT_DIR}/gbs.conf build -P profile.Main2017_KantM -A armv7l --include-all --threads 1
 
 
 #remove temporary files

diff --git a/network-manager/scripts/deploy-kantm.sh b/network-manager/scripts/deploy-kantm.sh
index 86ee048..bccc45e 100755 (executable)
--- a/network-manager/scripts/deploy-kantm.sh
+++ b/network-manager/scripts/deploy-kantm.sh
@@ -17,4 +17,4 @@ sdb push ${RPMS_TO_PUSH} /tmp/
 
 sdb shell "rpm -Uvi --nodeps --force --replacefiles /tmp/nwmanager-*.rpm"
 
-sdb shell "/opt/usr/apps/network-manager/test"
+sdb shell "/usr/apps/network-manager/test"

diff --git a/network-manager/scripts/deploy-tm2.sh b/network-manager/scripts/deploy-tm2.sh
index e2cf7e1..df687b2 100755 (executable)
--- a/network-manager/scripts/deploy-tm2.sh
+++ b/network-manager/scripts/deploy-tm2.sh
@@ -17,4 +17,4 @@ sdb push ${RPMS_TO_PUSH} /tmp/
 
 sdb shell "rpm -Uvi --nodeps --force --replacefiles /tmp/nwmanager-*.rpm"
 
-sdb shell "/opt/usr/apps/network-manager/test"
+sdb shell "/usr/apps/network-manager/test"

diff --git a/network-manager/test/CMakeLists.txt b/network-manager/test/CMakeLists.txt
index 4b55790..10de7e1 100644 (file)
--- a/network-manager/test/CMakeLists.txt
+++ b/network-manager/test/CMakeLists.txt
@@ -13,7 +13,7 @@ add_dependencies (${PROJECT_NAME} ${NETWORK_MANAGER_LIB_PROJECT_NAME})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-target_link_libraries(${PROJECT_NAME} gtest ${NETWORK_MANAGER_LIB_PROJECT_NAME} pthread)
+target_link_libraries(${PROJECT_NAME} ${GTEST_LIB} ${NETWORK_MANAGER_LIB_PROJECT_NAME} pthread)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${TESTS_DIR})
 install(FILES tests.manifest DESTINATION ${MANIFESTDIR})

diff --git a/network-manager/test/test_REST.cpp b/network-manager/test/test_REST.cpp
index 42e9f1f..5a631ce 100644 (file)
--- a/network-manager/test/test_REST.cpp
+++ b/network-manager/test/test_REST.cpp
@@ -2,16 +2,24 @@
 #include <gtest/gtest.h>
 #include <rest_helper.h>
 #include <string>
+#include <stdexcept>
 
 using namespace std;
 
 
 TEST(test_REST, simple_get)
 {
-    network::RestHelper get_request("http://example.com");
-    string uri("/");
-    string response;
-    network::RestHelper::Params params;
-    ASSERT_EQ(network::RestHelper::REST_SUCCESS, get_request.GetRequest(params, uri, response));
-    cout << response << endl;
+    try
+    {
+        network::RestHelper get_request("http://172.217.25.3:80");
+        string uri("");
+        string response;
+        network::RestHelper::Params params;
+        ASSERT_EQ(network::RestHelper::REST_SUCCESS, get_request.GetRequest(params, uri, response));
+        cout << response << endl;
+    }
+    catch (exception& e)
+    {
+        cerr << "EXCEPTION: " << e.what() << endl;
+    }
 }