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

src/or/connection_edge.h

@@ -12,7 +12,7 @@
 #ifndef TOR_CONNECTION_EDGE_H
 #define TOR_CONNECTION_EDGE_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 edge_connection_t *TO_EDGE_CONN(connection_t *);
 entry_connection_t *TO_ENTRY_CONN(connection_t *);

src/or/dirauth/dircollate.h

@@ -12,7 +12,7 @@
 #ifndef TOR_DIRCOLLATE_H
 #define TOR_DIRCOLLATE_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "or/or.h"
 
 typedef struct dircollator_s dircollator_t;

src/or/dirserv.h

@@ -12,7 +12,7 @@
 #ifndef TOR_DIRSERV_H
 #define TOR_DIRSERV_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /** What fraction (1 over this number) of the relay ID space do we
  * (as a directory authority) launch connections to at each reachability

src/or/geoip.h

@@ -12,7 +12,7 @@
 #ifndef TOR_GEOIP_H
 #define TOR_GEOIP_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "or/dos.h"
 
 #ifdef GEOIP_PRIVATE

src/or/hibernate.h

@@ -12,7 +12,7 @@
 #ifndef TOR_HIBERNATE_H
 #define TOR_HIBERNATE_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 int accounting_parse_options(const or_options_t *options, int validate_only);
 MOCK_DECL(int, accounting_is_enabled, (const or_options_t *options));

src/or/keypin.h

@@ -4,7 +4,7 @@
 #ifndef TOR_KEYPIN_H
 #define TOR_KEYPIN_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 int keypin_check_and_add(const uint8_t *rsa_id_digest,
                          const uint8_t *ed25519_id_key,

src/or/networkstatus.h

@@ -12,7 +12,7 @@
 #ifndef TOR_NETWORKSTATUS_H
 #define TOR_NETWORKSTATUS_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 void networkstatus_reset_warnings(void);
 void networkstatus_reset_download_failures(void);

src/or/router.h

@@ -12,7 +12,7 @@
 #ifndef TOR_ROUTER_H
 #define TOR_ROUTER_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 #define TOR_ROUTERINFO_ERROR_NO_EXT_ADDR     (-1)
 #define TOR_ROUTERINFO_ERROR_CANNOT_PARSE    (-2)

src/or/routerlist.h

@@ -11,7 +11,7 @@
 #ifndef TOR_ROUTERLIST_H
 #define TOR_ROUTERLIST_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 int get_n_authorities(dirinfo_type_t type);
 int trusted_dirs_reload_certs(void);

src/or/scheduler.h

@@ -11,7 +11,7 @@
 
 #include "or/or.h"
 #include "or/channel.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 /** Scheduler type, we build an ordered list with those values from the
  * parsed strings in Schedulers. The reason to do such a thing is so we can

src/or/status.h

@@ -4,7 +4,7 @@
 #ifndef TOR_STATUS_H
 #define TOR_STATUS_H
 
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 
 int log_heartbeat(time_t now);
 

src/test/test_channelpadding.c

@@ -7,7 +7,7 @@
 #define TOR_TIMERS_PRIVATE
 #include "or/or.h"
 #include "test/test.h"
-#include "common/testsupport.h"
+#include "lib/testsupport/testsupport.h"
 #include "or/connection.h"
 #include "or/connection_or.h"
 #include "or/channel.h"