Merge branch 'appveyor' of github.com:boxbackup/boxbackup into appveyor

Some local commits were not pushed before, sorry.

2 files changed, 12 insertions, 0 deletions

diff --git a/lib/common/Test.h b/lib/common/Test.h
index 15a3db6f..36cd6a59 100644
--- a/lib/common/Test.h
+++ b/lib/common/Test.h
@@ -243,4 +243,12 @@ void safe_sleep(int seconds);
 std::auto_ptr<Configuration> load_config_file(const std::string& config_file,
 	const ConfigurationVerify& verify);
 
+#ifdef _MSC_VER
+	// Our CMakeFiles compile tests to different executable filenames,
+	// e.g. test_common.exe instead of _test.exe.
+	#define TEST_EXECUTABLE BOX_MODULE ".exe"
+#else
+	#define TEST_EXECUTABLE "./_test"
+#endif
+
 #endif // TEST__H
diff --git a/lib/win32/emu.h b/lib/win32/emu.h
index 8014316a..b0fa2832 100644
--- a/lib/win32/emu.h
+++ b/lib/win32/emu.h
@@ -162,6 +162,10 @@ inline int geteuid(void)
 {
 	return 0;
 }
+inline int getpid(void)
+{
+	return GetCurrentProcessId();
+}
 
 #ifndef PATH_MAX
 #define PATH_MAX MAX_PATH