From b24d9c4413b9d7f55f4105adeb7cf9a2450d3204 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 29 Nov 2021 23:02:27 +0200 Subject: test: Store path to the test executable in Test class Store the path to the test executable, found in argv[0], in the Test instance. This can be useful for tests that need to fork processes. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- test/ipc/unixsocket.cpp | 4 +++- test/ipc/unixsocket_ipc.cpp | 4 +++- test/libtest/test.cpp | 5 +++++ test/libtest/test.h | 15 ++++++++++++--- test/log/log_process.cpp | 4 +++- test/process/process_test.cpp | 5 +++-- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp index 7270bf4d..4fc1c10a 100644 --- a/test/ipc/unixsocket.cpp +++ b/test/ipc/unixsocket.cpp @@ -501,5 +501,7 @@ int main(int argc, char **argv) return slave.run(ipcfd); } - return UnixSocketTest().execute(); + UnixSocketTest test; + test.setArgs(argc, argv); + return test.execute(); } diff --git a/test/ipc/unixsocket_ipc.cpp b/test/ipc/unixsocket_ipc.cpp index ab5d2557..2e3b52ca 100644 --- a/test/ipc/unixsocket_ipc.cpp +++ b/test/ipc/unixsocket_ipc.cpp @@ -227,5 +227,7 @@ int main(int argc, char **argv) return slave.run(ipcfd); } - return UnixSocketTestIPC().execute(); + UnixSocketTestIPC test; + test.setArgs(argc, argv); + return test.execute(); } diff --git a/test/libtest/test.cpp b/test/libtest/test.cpp index fd9f3d74..af37b4dd 100644 --- a/test/libtest/test.cpp +++ b/test/libtest/test.cpp @@ -17,6 +17,11 @@ Test::~Test() { } +void Test::setArgs([[maybe_unused]] int argc, char *argv[]) +{ + self_ = argv[0]; +} + int Test::execute() { int ret; diff --git a/test/libtest/test.h b/test/libtest/test.h index ee01a225..23b07743 100644 --- a/test/libtest/test.h +++ b/test/libtest/test.h @@ -8,6 +8,7 @@ #pragma once #include +#include enum TestStatus { TestPass = 0, @@ -21,16 +22,24 @@ public: Test(); virtual ~Test(); + void setArgs(int argc, char *argv[]); int execute(); + const std::string &self() const { return self_; } + protected: virtual int init() { return 0; } virtual int run() = 0; virtual void cleanup() {} + +private: + std::string self_; }; -#define TEST_REGISTER(klass) \ -int main([[maybe_unused]] int argc, [[maybe_unused]] char *argv[]) \ +#define TEST_REGISTER(Klass) \ +int main(int argc, char *argv[]) \ { \ - return klass().execute(); \ + Klass klass; \ + klass.setArgs(argc, argv); \ + return klass.execute(); \ } diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp index a56a3998..ca835133 100644 --- a/test/log/log_process.cpp +++ b/test/log/log_process.cpp @@ -154,5 +154,7 @@ int main(int argc, char **argv) return child.run(status, num); } - return LogProcessTest().execute(); + LogProcessTest test; + test.setArgs(argc, argv); + return test.execute(); } diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp index 378d680b..96bea17f 100644 --- a/test/process/process_test.cpp +++ b/test/process/process_test.cpp @@ -9,7 +9,6 @@ #include #include - #include #include #include @@ -106,5 +105,7 @@ int main(int argc, char **argv) return child.run(status); } - return ProcessTest().execute(); + ProcessTest test; + test.setArgs(argc, argv); + return test.execute(); } -- cgit v1.2.1