Use paths relative to executable location to find subprocess executables

smessmer · smessmer · commit 2150446a2c02 · 2019-03-23T22:01:26.000-07:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -7,6 +7,7 @@ Fixed bugs:
 
 Other:
 * Updated to crypto++ 8.1
+* Unit tests can now be run from any directory
 
 
 Version 0.10.0
diff --git a/appveyor.yml b/appveyor.yml
@@ -36,7 +36,7 @@ build_script:
   - cmd: cmake --build . --config %CONFIGURATION%
   - cmd: .\test\gitversion\gitversion-test.exe
   # cpp-utils-test disables ThreadDebuggingTest_ThreadName.*_thenIsCorrect because the appveyor image is too old to support the API needed for that
-  - cmd: cd .\test\cpp-utils\ && .\cpp-utils-test.exe --gtest_filter=-ThreadDebuggingTest_ThreadName.*_thenIsCorrect && cd ..\..
+  - cmd: .\test\cpp-utils\cpp-utils-test.exe --gtest_filter=-ThreadDebuggingTest_ThreadName.*_thenIsCorrect
   #- cmd: .\test\fspp\fspp-test.exe
   - cmd: .\test\parallelaccessstore\parallelaccessstore-test.exe
   - cmd: .\test\blockstore\blockstore-test.exe
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,6 +1,7 @@
 if (BUILD_TESTING)
   include_directories(../src)
 
+  add_subdirectory(my-gtest-main)
   add_subdirectory(gitversion)
   add_subdirectory(cpp-utils)
   if (NOT MSVC)
diff --git a/test/blobstore/CMakeLists.txt b/test/blobstore/CMakeLists.txt
@@ -27,7 +27,7 @@ set(SOURCES
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest blobstore)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blobstore)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/test/blockstore/CMakeLists.txt b/test/blockstore/CMakeLists.txt
@@ -42,7 +42,7 @@ set(SOURCES
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest blockstore)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blockstore)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt
@@ -69,7 +69,7 @@ target_activate_cpp14(${PROJECT_NAME}_exit_signal)
 target_link_libraries(${PROJECT_NAME}_exit_signal cpp-utils)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest cpp-utils)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cpp-utils)
 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_exit_status ${PROJECT_NAME}_exit_signal)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
diff --git a/test/cpp-utils/assert/backtrace_test.cpp b/test/cpp-utils/assert/backtrace_test.cpp
@@ -2,18 +2,24 @@
 #include <csignal>
 #include "cpp-utils/assert/backtrace.h"
 #include "cpp-utils/process/subprocess.h"
+#include <boost/filesystem.hpp>
+#include "my-gtest-main.h"
 
 using std::string;
 using testing::HasSubstr;
+namespace bf = boost::filesystem;
 
 namespace {
 	std::string call_process_exiting_with(const std::string& kind, const std::string& signal = "") {
 #if defined(_MSC_VER)
-		constexpr const char* executable = "cpp-utils-test_exit_signal.exe";
+		auto executable = get_executable().parent_path() / "cpp-utils-test_exit_signal.exe";
 #else
-		constexpr const char* executable = "./test/cpp-utils/cpp-utils-test_exit_signal";
+		auto executable = get_executable().parent_path() / "cpp-utils-test_exit_signal";
 #endif
-		const std::string command = std::string(executable) + " \"" + kind + "\" \"" + signal + "\"  2>&1";
+		if (!bf::exists(executable)) {
+			throw std::runtime_error(executable.string() + " not found.");
+		}
+		const std::string command = executable.string() + " \"" + kind + "\" \"" + signal + "\"  2>&1";
 		auto result = cpputils::Subprocess::call(command);
 		return result.output;
 	}
diff --git a/test/cpp-utils/process/SubprocessTest.cpp b/test/cpp-utils/process/SubprocessTest.cpp
@@ -1,19 +1,26 @@
 #include <cpp-utils/process/subprocess.h>
 #include <gtest/gtest.h>
+#include <boost/filesystem.hpp>
 
 #include <cpp-utils/lock/ConditionBarrier.h>
+#include "my-gtest-main.h"
 
 using cpputils::Subprocess;
 using cpputils::SubprocessError;
+using std::string;
+namespace bf = boost::filesystem;
 
 namespace {
 std::string exit_with_message_and_status(const char* message, int status) {
 #if defined(_MSC_VER)
-    constexpr const char* executable = "cpp-utils-test_exit_status.exe";
+    auto executable = get_executable().parent_path() / "cpp-utils-test_exit_status.exe";
 #else
-    constexpr const char* executable = "./test/cpp-utils/cpp-utils-test_exit_status";
+    auto executable = get_executable().parent_path() / "cpp-utils-test_exit_status";
 #endif
-	return std::string(executable) + " \"" + message + "\" " + std::to_string(status);
+    if (!bf::exists(executable)) {
+        throw std::runtime_error(executable.string() + " not found.");
+    }
+	return executable.string() + " \"" + message + "\" " + std::to_string(status);
 }
 }
 
diff --git a/test/cryfs-cli/CMakeLists.txt b/test/cryfs-cli/CMakeLists.txt
@@ -16,7 +16,7 @@ set(SOURCES
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest cryfs-cli cryfs-unmount fspp-fuse)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs-cli cryfs-unmount fspp-fuse)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/test/cryfs/CMakeLists.txt b/test/cryfs/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SOURCES
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest cryfs)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/test/fspp/CMakeLists.txt b/test/fspp/CMakeLists.txt
@@ -102,7 +102,7 @@ set(SOURCES
         testutils/OpenFileHandle.cpp testutils/OpenFileHandle.h)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest fspp-interface fspp-fuse)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest fspp-interface fspp-fuse)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/test/gitversion/CMakeLists.txt b/test/gitversion/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCES
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest gitversion)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest gitversion)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/test/my-gtest-main/CMakeLists.txt b/test/my-gtest-main/CMakeLists.txt
@@ -0,0 +1,13 @@
+project (my-gtest-main)
+
+set(SOURCES
+    my-gtest-main.cpp
+)
+
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+target_link_libraries(${PROJECT_NAME} PUBLIC googletest cpp-utils)
+target_add_boost(${PROJECT_NAME} filesystem system)
+target_include_directories(${PROJECT_NAME} PUBLIC .)
+
+target_enable_style_warnings(${PROJECT_NAME})
+target_activate_cpp14(${PROJECT_NAME})
diff --git a/test/my-gtest-main/my-gtest-main.cpp b/test/my-gtest-main/my-gtest-main.cpp
@@ -0,0 +1,27 @@
+#include "my-gtest-main.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include <boost/optional.hpp>
+#include <cpp-utils/assert/assert.h>
+
+namespace {
+	boost::optional<boost::filesystem::path> executable;
+}
+
+const boost::filesystem::path& get_executable() {
+	ASSERT(executable != boost::none, "Executable path not set");
+	return *executable;
+}
+
+
+int main(int argc, char** argv) {
+	executable = boost::filesystem::path(argv[0]);
+
+	// Since Google Mock depends on Google Test, InitGoogleMock() is
+	// also responsible for initializing Google Test.  Therefore there's
+	// no need for calling testing::InitGoogleTest() separately.
+	testing::InitGoogleMock(&argc, argv);
+	return RUN_ALL_TESTS();
+}
diff --git a/test/my-gtest-main/my-gtest-main.h b/test/my-gtest-main/my-gtest-main.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <boost/filesystem/path.hpp>
+
+const boost::filesystem::path& get_executable();
diff --git a/test/parallelaccessstore/CMakeLists.txt b/test/parallelaccessstore/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCES
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest parallelaccessstore)
+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest parallelaccessstore)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})
diff --git a/vendor/googletest/CMakeLists.txt b/vendor/googletest/CMakeLists.txt
@@ -10,7 +10,6 @@ if (BUILD_TESTING)
   project (googletest)
   add_library(${PROJECT_NAME} dummy.cpp)
   target_link_libraries(${PROJECT_NAME} PUBLIC gtest gmock)
-  target_link_libraries(${PROJECT_NAME} PRIVATE gmock_main)
   target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE ${gtest_INCLUDE_DIRS}/include SYSTEM ${gmock_INCLUDE_DIRS}/include)
 
   # Disable "missing override" warning because gmock MOCK_METHOD() don't use override :(

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ set(SOURCES`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`add_executable(${PROJECT_NAME} ${SOURCES})`
`30`		`-target_link_libraries(${PROJECT_NAME} googletest blobstore)`
	`30`	`+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blobstore)`
`31`	`31`	`add_test(${PROJECT_NAME} ${PROJECT_NAME})`
`32`	`32`
`33`	`33`	`target_enable_style_warnings(${PROJECT_NAME})`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ set(SOURCES`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`add_executable(${PROJECT_NAME} ${SOURCES})`
`45`		`-target_link_libraries(${PROJECT_NAME} googletest blockstore)`
	`45`	`+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest blockstore)`
`46`	`46`	`add_test(${PROJECT_NAME} ${PROJECT_NAME})`
`47`	`47`
`48`	`48`	`target_enable_style_warnings(${PROJECT_NAME})`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ set(SOURCES`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`add_executable(${PROJECT_NAME} ${SOURCES})`
`19`		`-target_link_libraries(${PROJECT_NAME} googletest cryfs-cli cryfs-unmount fspp-fuse)`
	`19`	`+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs-cli cryfs-unmount fspp-fuse)`
`20`	`20`	`add_test(${PROJECT_NAME} ${PROJECT_NAME})`
`21`	`21`
`22`	`22`	`target_enable_style_warnings(${PROJECT_NAME})`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ set(SOURCES`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`add_executable(${PROJECT_NAME} ${SOURCES})`
`27`		`-target_link_libraries(${PROJECT_NAME} googletest cryfs)`
	`27`	`+target_link_libraries(${PROJECT_NAME} my-gtest-main googletest cryfs)`
`28`	`28`	`add_test(${PROJECT_NAME} ${PROJECT_NAME})`
`29`	`29`
`30`	`30`	`target_enable_style_warnings(${PROJECT_NAME})`