luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix logging_striplog_test.sh in debug mode. Fixes issue 108.

Browse Source 
git-svn-id: https://google-glog.googlecode.com/svn/trunk@99 eb4d4688-79bd-11dd-afb4-1d65580434c0
This commit is contained in:
2011-12-29 12:36:09 +00:00
parent 5a05c30365
commit d8944b1743
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/logging_striplog_test.sh
View File

@ -60,9 +60,16 @@ die () {
# Check that the string literals are appropriately stripped. This will # Check that the string literals are appropriately stripped. This will
# not be the case in debug mode. # not be the case in debug mode.
check_eq "`get_strings logging_striptest0`" "COND ERROR FATAL INFO WARNING " mode=`GLOG_check_mode=1 ./logging_striptest0 2> /dev/null`
check_eq "`get_strings logging_striptest2`" "COND ERROR FATAL " if [ "$mode" = "opt" ];
check_eq "`get_strings logging_striptest10`" "" then
echo "In OPT mode"
check_eq "`get_strings logging_striptest0`" "COND ERROR FATAL INFO USAGE WARNING "
check_eq "`get_strings logging_striptest2`" "COND ERROR FATAL USAGE "
check_eq "`get_strings logging_striptest10`" ""
else
echo "In DBG mode; not checking strings"
fi
# Check that LOG(FATAL) aborts even for large STRIP_LOG # Check that LOG(FATAL) aborts even for large STRIP_LOG

5
src/logging_striptest_main.cc
View File

@ -39,6 +39,7 @@
#include "config.h" #include "config.h"
DECLARE_bool(logtostderr); DECLARE_bool(logtostderr);
GLOG_DEFINE_bool(check_mode, false, "Prints 'opt' or 'dbg'");
using std::string; using std::string;
using namespace GOOGLE_NAMESPACE; using namespace GOOGLE_NAMESPACE;
@ -58,6 +59,10 @@ std::ostream &operator<<(std::ostream &str, const A&) {return str;}
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
FLAGS_logtostderr = true; FLAGS_logtostderr = true;
InitGoogleLogging(argv[0]); InitGoogleLogging(argv[0]);
if (FLAGS_check_mode) {
printf("%s\n", DEBUG_MODE ? "dbg" : "opt");
return 0;
}
LOG(INFO) << "TESTMESSAGE INFO"; LOG(INFO) << "TESTMESSAGE INFO";
LOG(WARNING) << 2 << "something" << "TESTMESSAGE WARNING" LOG(WARNING) << 2 << "something" << "TESTMESSAGE WARNING"
<< 1 << 'c' << A() << std::endl; << 1 << 'c' << A() << std::endl;