Move TEST_SRC_DIR from googletest.h to config.h.
Now test passes out side tree. git-svn-id: https://google-glog.googlecode.com/svn/trunk@85 eb4d4688-79bd-11dd-afb4-1d65580434c0
This commit is contained in:
parent
f31f51085c
commit
1f8dac87fc
6
configure
vendored
6
configure
vendored
@ -25062,6 +25062,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
echo "$as_me: WARNING: Could not find the PC. Will not output failed addresses..." >&2;}
|
||||
fi
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define TEST_SRC_DIR "$srcdir"
|
||||
_ACEOF
|
||||
|
||||
|
||||
# These are what's needed by logging.h.in and raw_logging.h.in
|
||||
|
||||
|
||||
|
||||
@ -176,6 +176,8 @@ AC_CXX_USING_OPERATOR
|
||||
|
||||
AC_PC_FROM_UCONTEXT(AC_MSG_WARN(Could not find the PC. Will not output failed addresses...))
|
||||
|
||||
AC_DEFINE_UNQUOTED(TEST_SRC_DIR, "$srcdir", [location of source code])
|
||||
|
||||
# These are what's needed by logging.h.in and raw_logging.h.in
|
||||
AC_SUBST(ac_google_start_namespace)
|
||||
AC_SUBST(ac_google_end_namespace)
|
||||
|
||||
@ -145,6 +145,9 @@
|
||||
/* the namespace where STL code like vector<> is defined */
|
||||
#undef STL_NAMESPACE
|
||||
|
||||
/* location of source code */
|
||||
#undef TEST_SRC_DIR
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
|
||||
@ -85,7 +85,8 @@ static inline string GetTempDir() {
|
||||
// The test will run in glog/vsproject/<project name>
|
||||
// (e.g., glog/vsproject/logging_unittest).
|
||||
static const char TEST_SRC_DIR[] = "../..";
|
||||
#else
|
||||
#elif !defined(TEST_SRC_DIR)
|
||||
# warning TEST_SRC_DIR should be defined in config.h
|
||||
static const char TEST_SRC_DIR[] = ".";
|
||||
#endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user