summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-29 11:42:52 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-29 12:21:52 -0400
commit6ac64e16ed6958d1a5960c560254217478b7ad87 (patch)
tree735265160969e1d4353168742124427f56b0df30 /src/test
parent077176a34c54929580a0178ce6667ae180c352d1 (diff)
downloadtor-6ac64e16ed6958d1a5960c560254217478b7ad87.tar.gz
tor-6ac64e16ed6958d1a5960c560254217478b7ad87.zip
Eliminate compat.h
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-memwipe.c1
-rw-r--r--src/test/test-timers.c1
-rw-r--r--src/test/test.h1
-rw-r--r--src/test/test_crypto_openssl.c1
-rw-r--r--src/test/test_hs_ntor_cl.c1
-rw-r--r--src/test/test_link_handshake.c3
-rw-r--r--src/test/test_ntor_cl.c1
-rw-r--r--src/test/test_tortls.c3
8 files changed, 1 insertions, 11 deletions
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 16bb017c89..552cbbc551 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -8,7 +8,6 @@
#include <stdlib.h>
#include "lib/crypt_ops/crypto_util.h"
-#include "common/compat.h"
#include "common/util.h"
static unsigned fill_a_buffer_memset(void) __attribute__((noinline));
diff --git a/src/test/test-timers.c b/src/test/test-timers.c
index 70f07fba47..f6ff9a5f80 100644
--- a/src/test/test-timers.c
+++ b/src/test/test-timers.c
@@ -7,7 +7,6 @@
#include <stdio.h>
#include <string.h>
-#include "common/compat.h"
#include "common/compat_libevent.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "common/timers.h"
diff --git a/src/test/test.h b/src/test/test.h
index 9abd46008d..c231bc5f87 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -13,7 +13,6 @@
#define DEBUG_SMARTLIST 1
-#include "common/compat.h"
#include "tinytest.h"
#define TT_EXIT_TEST_FUNCTION STMT_BEGIN goto done; STMT_END
#include "tinytest_macros.h"
diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c
index a01de18a6e..d443ba6fd0 100644
--- a/src/test/test_crypto_openssl.c
+++ b/src/test/test_crypto_openssl.c
@@ -10,7 +10,6 @@
#include "lib/crypt_ops/crypto_rand.h"
#include "common/util.h"
#include "lib/encoding/binascii.h"
-#include "common/compat.h"
#include "test/test.h"
#include <openssl/evp.h>
diff --git a/src/test/test_hs_ntor_cl.c b/src/test/test_hs_ntor_cl.c
index 9b59f0ddb6..5475f3b38c 100644
--- a/src/test/test_hs_ntor_cl.c
+++ b/src/test/test_hs_ntor_cl.c
@@ -15,7 +15,6 @@
#define ONION_NTOR_PRIVATE
#include "or/or.h"
#include "common/util.h"
-#include "common/compat.h"
#include "lib/crypt_ops/crypto.h"
#include "lib/crypt_ops/crypto_curve25519.h"
#include "or/hs_ntor.h"
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index 2650caf950..ffb6c47b1e 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -8,8 +8,6 @@
#define TOR_CHANNEL_INTERNAL_
#define TORTLS_PRIVATE
-#include "common/compat.h"
-
#include "or/or.h"
#include "or/config.h"
#include "or/connection.h"
@@ -1581,4 +1579,3 @@ struct testcase_t link_handshake_tests[] = {
END_OF_TESTCASES
};
-
diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c
index a10cd7e9b5..75d5ccc126 100644
--- a/src/test/test_ntor_cl.c
+++ b/src/test/test_ntor_cl.c
@@ -8,7 +8,6 @@
#define ONION_NTOR_PRIVATE
#include "or/or.h"
#include "common/util.h"
-#include "common/compat.h"
#include "lib/crypt_ops/crypto.h"
#include "lib/crypt_ops/crypto_curve25519.h"
#include "or/onion_ntor.h"
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index f1b9b99f58..b456734684 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -11,7 +11,7 @@
#endif
#include <math.h>
-#include "common/compat.h"
+#include "lib/cc/compat_compiler.h"
/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
* srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
@@ -2839,4 +2839,3 @@ struct testcase_t tortls_tests[] = {
LOCAL_TEST_CASE(context_init_one, 0),
END_OF_TESTCASES
};
-