Changeset 2082 for box/trunk/infrastructure/buildenv-testmain-template.cpp

Timestamp:

31/01/2008 23:52:08 (4 years ago)

Author:

chris

Message:

Add support for verbosity control in tests.

File:

• box/trunk/infrastructure/buildenv-testmain-template.cpp (modified) (5 diffs)

box/trunk/infrastructure/buildenv-testmain-template.cpp

@@ -161 +161 @@
 
 #ifdef HAVE_GETOPT_H
+        #ifdef NDEBUG
+        int logLevel = Log::NOTICE; // need an int to do math with
+        #else
+        int logLevel = Log::INFO; // need an int to do math with
+        #endif
+
         struct option longopts[] = 
         {
@@ -171 +177 @@
         int ch;
         
-        while ((ch = getopt_long(argc, argv, "c:d:s:t:TUV", longopts, NULL))
+        while ((ch = getopt_long(argc, argv, "c:d:qs:t:vTUV", longopts, NULL))
                 != -1)
         {
@@ -203 +209 @@
                         break;
 
+                        case 'q':
+                        {
+                                if(logLevel == Log::NOTHING)
+                                {
+                                        BOX_FATAL("Too many '-q': "
+                                                "Cannot reduce logging "
+                                                "level any more");
+                                        return 2;
+                                }
+                                logLevel--;
+                        }
+                        break;
+
+                        case 'v':
+                        {
+                                if(logLevel == Log::EVERYTHING)
+                                {
+                                        BOX_FATAL("Too many '-v': "
+                                                "Cannot increase logging "
+                                                "level any more");
+                                        return 2;
+                                }
+                                logLevel++;
+                        }
+                        break;
+
+                        case 'V':
+                        {
+                                logLevel = Log::EVERYTHING;
+                        }
+                        break;
+
                         case 't':
                         {
@@ -219 +257 @@
                                 Console::SetShowTime(true);
                                 Console::SetShowTimeMicros(true);
-                        }
-                        break;
-
-                        case 'V':
-                        {
-                                Logging::SetGlobalLevel(Log::EVERYTHING);
                         }
                         break;
@@ -243 +275 @@
                 }
         }
+
+        Logging::SetGlobalLevel((Log::Level)logLevel);
 
         argc -= optind - 1;