Merge lp:~michihenning/unity-scopes-api/fix-valgrind-complaints into lp:unity-scopes-api

[Michi Henning]

Added valgrind suppression for leak in net-cpp. Added work-around for valgrind complaint about invalid envp being passed when calling execl().

Added valgrind suppression for leak in net-cpp. Added work-around for valgrind complaint about invalid envp being passed when calling execl().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/569/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/95

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/569/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'test/gtest/scopes/internal/smartscopes/RaiiServer.h'
--- test/gtest/scopes/internal/smartscopes/RaiiServer.h	2014-12-08 17:19:40 +0000
+++ test/gtest/scopes/internal/smartscopes/RaiiServer.h	2015-02-09 07:56:24 +0000
@@ -61,7 +61,9 @@
                     throw unity::ResourceException("Write pipe duplication failed");
                 }
 
-                execl(server_path.c_str(), server_path.c_str(), arg.c_str(), NULL);
+                // execle() instead of execl(). Otherwise, valgrind complains about
+                // an invalid envp being passed from execl() to execle().
+                execle(server_path.c_str(), server_path.c_str(), arg.c_str(), nullptr, nullptr);
                 throw unity::ResourceException("Failed to execute fake server script");
             default: // parent
                 close(pipefd[1]);       // close write

=== modified file 'valgrind-suppress'
--- valgrind-suppress	2015-01-16 07:28:03 +0000
+++ valgrind-suppress	2015-02-09 07:56:24 +0000
@@ -190,3 +190,18 @@
    fun:zmq_getsockopt
 }
 
+# Leaks in net-cpp. See bug #1419620
+# TODO: Remove these two suppressions once that bug is fixed.
+{
+    net_cpp_client_leak
+    Memcheck:Leak
+    ...
+    fun:_ZN4core3net4http4impl4curl6Client3getERKNS1_7Request13ConfigurationE
+}
+
+{
+    net_cpp_client_leak_2
+    Memcheck:Leak
+    ...
+    fun:_ZN4core3net4http11make_clientEv
+}