[or-cvs] [tor/master 04/12] Comment out the (unused) RunTesting option

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Sat, 30 Oct 2010 00:03:31 +0200
Subject: Comment out the (unused) RunTesting option
Commit: 13a7e8bea3b9d37b1bfd5e3a3ea14dd650be632e

The code that makes use of the RunTesting option is #if 0, so setting
this option has no effect. Mark the option as obsolete for now, so that
Tor doesn't list it as an available option erroneously.
---
 src/or/config.c |    3 ++-
 src/or/or.h     |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index ee0c466..655af37 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -337,7 +337,8 @@ static config_var_t _option_vars[] = {
   V(RephistTrackTime,            INTERVAL, "24 hours"),
   OBSOLETE("RouterFile"),
   V(RunAsDaemon,                 BOOL,     "0"),
-  V(RunTesting,                  BOOL,     "0"),
+//  V(RunTesting,                  BOOL,     "0"),
+  OBSOLETE("RunTesting"), // currently unused
   V(SafeLogging,                 STRING,   "1"),
   V(SafeSocks,                   BOOL,     "0"),
   V(ServerDNSAllowBrokenConfig,  BOOL,     "1"),
diff --git a/src/or/or.h b/src/or/or.h
index 2e65459..e4d57dd 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2548,8 +2548,8 @@ typedef struct {
   uint64_t PerConnBWRate; /**< Long-term bw on a single TLS conn, if set. */
   uint64_t PerConnBWBurst; /**< Allowed burst on a single TLS conn, if set. */
   int NumCpus; /**< How many CPUs should we try to use? */
-  int RunTesting; /**< If true, create testing circuits to measure how well the
-                   * other ORs are running. */
+//int RunTesting; /**< If true, create testing circuits to measure how well the
+//                 * other ORs are running. */
   config_line_t *RendConfigLines; /**< List of configuration lines
                                           * for rendezvous services. */
   config_line_t *HidServAuth; /**< List of configuration lines for client-side
-- 
1.7.1