Rectify include paths (automated).

You have no idea how glad I am that this is automated.

src/common/buffers.h

@@ -14,7 +14,7 @@
 
 #include "common/compat.h"
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 typedef struct buf_t buf_t;
 

src/common/compat.h

@@ -15,7 +15,7 @@
 #endif
 #endif
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif

src/common/compat_libevent.h

@@ -5,7 +5,7 @@
 #define TOR_COMPAT_LIBEVENT_H
 
 #include "orconfig.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 void configure_libevent_logging(void);
 void suppress_libevent_log_msg(const char *msg);

src/common/compat_threads.h

@@ -8,7 +8,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
 #include <pthread.h>

src/common/timers.h

@@ -5,7 +5,7 @@
 #define TOR_TIMERS_H
 
 #include "orconfig.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 struct monotime_t;
 typedef struct timeout tor_timer_t;

src/common/token_bucket.h

@@ -10,7 +10,7 @@
 #define TOR_TOKEN_BUCKET_H
 
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /** Largest allowable burst value for a token buffer. */
 #define TOKEN_BUCKET_MAX_BURST INT32_MAX

src/common/torlog.h

@@ -13,7 +13,7 @@
 #ifndef TOR_TORLOG_H
 
 #include "common/compat.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>

src/common/util.h

@@ -15,7 +15,7 @@
 #include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "lib/ctime/di_ops.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef _WIN32

src/common/util_bug.h

@@ -38,7 +38,7 @@
 
 #include "orconfig.h"
 #include "common/compat.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /* Replace assert() with a variant that sends failures to the log before
  * calling assert() normally.

src/common/util_format.h

@@ -7,7 +7,7 @@
 #ifndef TOR_UTIL_FORMAT_H
 #define TOR_UTIL_FORMAT_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "lib/cc/torint.h"
 
 /** @{ */

src/lib/crypt_ops/crypto_curve25519.h

@@ -4,7 +4,7 @@
 #ifndef TOR_CRYPTO_CURVE25519_H
 #define TOR_CRYPTO_CURVE25519_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_openssl_mgt.h"

src/lib/crypt_ops/crypto_ed25519.h

@@ -4,7 +4,7 @@
 #ifndef TOR_CRYPTO_ED25519_H
 #define TOR_CRYPTO_ED25519_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "common/util.h"

src/lib/crypt_ops/crypto_format.h

@@ -7,7 +7,7 @@
 #ifndef TOR_CRYPTO_FORMAT_H
 #define TOR_CRYPTO_FORMAT_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
 

src/lib/crypt_ops/crypto_rand.c

@@ -26,7 +26,7 @@
 #include "lib/crypt_ops/compat_openssl.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "common/sandbox.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/util_format.h"

src/lib/crypt_ops/crypto_rsa.h

@@ -18,7 +18,7 @@
 #include "lib/crypt_ops/crypto_digest.h"
 #include <stdio.h>
 #include "lib/cc/torint.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "common/compat.h"
 #include "common/util.h"
 #include "common/torlog.h"

src/lib/tls/tortls.h

@@ -14,7 +14,7 @@
 #include "lib/crypt_ops/crypto_rsa.h"
 #include "lib/crypt_ops/compat_openssl.h"
 #include "common/compat.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /* Opaque structure to hold a TLS connection. */
 typedef struct tor_tls_t tor_tls_t;

src/or/addressmap.h

@@ -7,7 +7,7 @@
 #ifndef TOR_ADDRESSMAP_H
 #define TOR_ADDRESSMAP_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 void addressmap_init(void);
 void addressmap_clear_excluded_trackexithosts(const or_options_t *options);

src/or/circuitlist.h

@@ -12,7 +12,7 @@
 #ifndef TOR_CIRCUITLIST_H
 #define TOR_CIRCUITLIST_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "or/hs_ident.h"
 
 /** Convert a circuit_t* to a pointer to the enclosing or_circuit_t.  Assert

src/or/circuitmux.h

@@ -10,7 +10,7 @@
 #define TOR_CIRCUITMUX_H
 
 #include "or/or.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 typedef struct circuitmux_policy_s circuitmux_policy_t;
 typedef struct circuitmux_policy_data_s circuitmux_policy_data_t;

src/or/config.h

@@ -12,7 +12,7 @@
 #ifndef TOR_CONFIG_H
 #define TOR_CONFIG_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN)
 #define KERNEL_MAY_SUPPORT_IPFW