projects
/
platform
/
upstream
/
glog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3325258
)
allow to define TEST_SRC_DIR as a macro
author
Sergiu Dotenco
<sergiu.dotenco@th-nuernberg.de>
Thu, 26 Mar 2015 14:56:33 +0000
(15:56 +0100)
committer
Sergiu Dotenco
<sergiu.dotenco@gmail.com>
Wed, 15 Jul 2015 20:34:58 +0000
(22:34 +0200)
src/googletest.h
patch
|
blob
|
history
diff --git
a/src/googletest.h
b/src/googletest.h
index
2525bc3
..
b4677b2
100644
(file)
--- a/
src/googletest.h
+++ b/
src/googletest.h
@@
-81,7
+81,7
@@
static inline string GetTempDir() {
#endif
}
-#if defined(OS_WINDOWS) && defined(_MSC_VER)
+#if defined(OS_WINDOWS) && defined(_MSC_VER)
&& !defined(TEST_SRC_DIR)
// The test will run in glog/vsproject/<project name>
// (e.g., glog/vsproject/logging_unittest).
static const char TEST_SRC_DIR[] = "../..";