summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-10 15:20:28 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-10 15:20:30 -0400
commite7f5f48d68553206b95cbb4f610702c887500124 (patch)
tree75cbf04d94e08c92d48f3518d506ec1166e862df /src/test
parent41640b65735ec6214aa5080c2143b0982a59bb93 (diff)
downloadtor-e7f5f48d68553206b95cbb4f610702c887500124.tar.gz
tor-e7f5f48d68553206b95cbb4f610702c887500124.zip
Rename torlog.[ch] to log.[ch]
Fun fact: these files used to be called log.[ch] until we ran into conflicts with systems having a log.h file. But now that we always include "lib/log/log.h", we should be fine.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/fuzz/fuzz_http.c2
-rw-r--r--src/test/fuzz/fuzz_http_connect.c2
-rw-r--r--src/test/log_test_helpers.c2
-rw-r--r--src/test/test_bt_cl.c2
-rw-r--r--src/test/test_logging.c2
-rw-r--r--src/test/test_status.c2
-rw-r--r--src/test/test_tortls.c2
-rw-r--r--src/test/test_util_slow.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index 61dc2144b4..2fbb275614 100644
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -12,7 +12,7 @@
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "feature/dircache/directory.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "feature/dircommon/dir_connection_st.h"
diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index 184bb52ee2..ca007a2c7f 100644
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -13,7 +13,7 @@
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h"
#include "core/proto/proto_socks.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "core/or/entry_connection_st.h"
#include "core/or/socks_request_st.h"
diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index e814555ba1..0d0f7574c3 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -1,7 +1,7 @@
/* Copyright (c) 2015-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#define LOG_PRIVATE
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "test/log_test_helpers.h"
/**
diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index 716cff36e0..89cbca2066 100644
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -9,7 +9,7 @@
#undef TOR_COVERAGE
#include "core/or/or.h"
#include "lib/err/backtrace.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/src/test/test_logging.c b/src/test/test_logging.c
index 2e3b8800ac..cd685a4af7 100644
--- a/src/test/test_logging.c
+++ b/src/test/test_logging.c
@@ -7,7 +7,7 @@
#include "core/or/or.h"
#include "app/config/config.h"
#include "lib/err/torerr.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "test/test.h"
#include "lib/process/subprocess.h"
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 3cc23955ad..15c406d2ff 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -12,7 +12,7 @@
#include <math.h>
#include "core/or/or.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "tor_queue.h"
#include "core/or/status.h"
#include "core/or/circuitlist.h"
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index 2b40ed72d9..54e5eca4f9 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls)
ENABLE_GCC_WARNING(redundant-decls)
#include "core/or/or.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "app/config/config.h"
#include "lib/tls/tortls.h"
#include "app/config/or_state_st.h"
diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c
index 5021e89dff..c5b24487b1 100644
--- a/src/test/test_util_slow.c
+++ b/src/test/test_util_slow.c
@@ -7,7 +7,7 @@
#define UTIL_PRIVATE
#define SUBPROCESS_PRIVATE
#include "lib/crypt_ops/crypto.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/process/subprocess.h"
#include "lib/process/waitpid.h"
#include "lib/string/printf.h"