test: Replace "/proc/self/exe" with path to test binary

When tests are run under valgrind, /proc/self/exe points to valgrind,
not to the test binary. This results in failures for tests that need to
fork processes. Fix it by replacing "/proc/self/exe" with the path to
the test binary.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

2 files changed, 3 insertions, 4 deletions

diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp
index 4fc1c10a..b3568c06 100644
--- a/test/ipc/unixsocket.cpp
+++ b/test/ipc/unixsocket.cpp
@@ -209,8 +209,7 @@ protected:
 
 		if (!pid_) {
 			std::string arg = std::to_string(fd);
-			execl("/proc/self/exe", "/proc/self/exe",
-			      arg.c_str(), nullptr);
+			execl(self().c_str(), self().c_str(), arg.c_str(), nullptr);
 
 			/* Only get here if exec fails. */
 			exit(TestFail);
@@ -464,7 +463,7 @@ private:
 
 	int prepareFDs(IPCUnixSocket::Payload *message, unsigned int num)
 	{
-		int fd = open("/proc/self/exe", O_RDONLY);
+		int fd = open(self().c_str(), O_RDONLY);
 		if (fd < 0)
 			return fd;
 
diff --git a/test/ipc/unixsocket_ipc.cpp b/test/ipc/unixsocket_ipc.cpp
index 2e3b52ca..1a8d06a1 100644
--- a/test/ipc/unixsocket_ipc.cpp
+++ b/test/ipc/unixsocket_ipc.cpp
@@ -173,7 +173,7 @@ protected:
 
 	int run()
 	{
-		ipc_ = std::make_unique<IPCPipeUnixSocket>("", "/proc/self/exe");
+		ipc_ = std::make_unique<IPCPipeUnixSocket>("", self().c_str());
 		if (!ipc_->isConnected()) {
 			cerr << "Failed to create IPCPipe" << endl;
 			return TestFail;