From 94852e75500422a2cacd70a6863b8876035f5e58 Mon Sep 17 00:00:00 2001 From: Jan Hutter Date: Wed, 23 Nov 2005 09:22:25 +0000 Subject: [PATCH] - changed include paths --- Source/charon/testcases/diffie_hellman_test.c | 8 +-- Source/charon/testcases/diffie_hellman_test.h | 2 +- Source/charon/testcases/event_queue_test.c | 4 +- Source/charon/testcases/event_queue_test.h | 2 +- Source/charon/testcases/generator_test.c | 28 ++++----- Source/charon/testcases/generator_test.h | 2 +- Source/charon/testcases/hasher_md5_test.c | 2 +- Source/charon/testcases/hasher_md5_test.h | 6 +- Source/charon/testcases/hasher_sha1_test.c | 2 +- Source/charon/testcases/hasher_sha1_test.h | 6 +- Source/charon/testcases/hmac_test.c | 4 +- Source/charon/testcases/hmac_test.h | 4 +- Source/charon/testcases/ike_sa_id_test.c | 2 +- Source/charon/testcases/ike_sa_id_test.h | 2 +- Source/charon/testcases/ike_sa_manager_test.c | 4 +- Source/charon/testcases/ike_sa_manager_test.h | 2 +- Source/charon/testcases/ike_sa_test.c | 6 +- Source/charon/testcases/ike_sa_test.h | 2 +- Source/charon/testcases/job_queue_test.c | 4 +- Source/charon/testcases/job_queue_test.h | 2 +- Source/charon/testcases/linked_list_test.c | 2 +- Source/charon/testcases/linked_list_test.h | 2 +- Source/charon/testcases/packet_test.c | 8 +-- Source/charon/testcases/packet_test.h | 2 +- Source/charon/testcases/parser_test.c | 20 +++---- Source/charon/testcases/parser_test.h | 2 +- Source/charon/testcases/prf_plus_test.c | 4 +- Source/charon/testcases/prf_plus_test.h | 4 +- Source/charon/testcases/receiver_test.c | 16 ++--- Source/charon/testcases/receiver_test.h | 2 +- Source/charon/testcases/scheduler_test.c | 8 +-- Source/charon/testcases/scheduler_test.h | 2 +- Source/charon/testcases/send_queue_test.c | 2 +- Source/charon/testcases/send_queue_test.h | 2 +- Source/charon/testcases/sender_test.c | 14 ++--- Source/charon/testcases/sender_test.h | 2 +- Source/charon/testcases/socket_test.c | 4 +- Source/charon/testcases/socket_test.h | 2 +- Source/charon/testcases/testcases.c | 58 +++++++++---------- Source/charon/testcases/thread_pool_test.c | 2 +- Source/charon/testcases/thread_pool_test.h | 2 +- 41 files changed, 127 insertions(+), 127 deletions(-) diff --git a/Source/charon/testcases/diffie_hellman_test.c b/Source/charon/testcases/diffie_hellman_test.c index a21629353..7f5da9cf1 100644 --- a/Source/charon/testcases/diffie_hellman_test.c +++ b/Source/charon/testcases/diffie_hellman_test.c @@ -24,10 +24,10 @@ #include "../transforms/diffie_hellman.h" -#include "../globals.h" -#include "../utils/logger_manager.h" -#include "../utils/allocator.h" -#include "../payloads/transform_substructure.h" +#include +#include +#include +#include /* * described in Header-File diff --git a/Source/charon/testcases/diffie_hellman_test.h b/Source/charon/testcases/diffie_hellman_test.h index f42de183f..fe3361a08 100644 --- a/Source/charon/testcases/diffie_hellman_test.h +++ b/Source/charon/testcases/diffie_hellman_test.h @@ -23,7 +23,7 @@ #ifndef DIFFIE_HELLMAN_TEST_H_ #define DIFFIE_HELLMAN_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the diffie_hellman_t functionality diff --git a/Source/charon/testcases/event_queue_test.c b/Source/charon/testcases/event_queue_test.c index f9f99bcc2..ed61bb7da 100644 --- a/Source/charon/testcases/event_queue_test.c +++ b/Source/charon/testcases/event_queue_test.c @@ -25,8 +25,8 @@ #include "event_queue_test.h" -#include "../utils/allocator.h" -#include "../queues/event_queue.h" +#include +#include /** * Number of different times to insert per thread diff --git a/Source/charon/testcases/event_queue_test.h b/Source/charon/testcases/event_queue_test.h index 4ac099b43..f154cafc8 100644 --- a/Source/charon/testcases/event_queue_test.h +++ b/Source/charon/testcases/event_queue_test.h @@ -23,7 +23,7 @@ #ifndef EVENT_QUEUE_TEST_H_ #define EVENT_QUEUE_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the event_queue functionality diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c index 9cedd9d73..28d92048b 100644 --- a/Source/charon/testcases/generator_test.c +++ b/Source/charon/testcases/generator_test.c @@ -24,20 +24,20 @@ #include "generator_test.h" -#include "../globals.h" -#include "../generator.h" -#include "../utils/allocator.h" -#include "../utils/logger_manager.h" -#include "../utils/logger.h" -#include "../payloads/encodings.h" -#include "../payloads/ike_header.h" -#include "../payloads/transform_attribute.h" -#include "../payloads/transform_substructure.h" -#include "../payloads/proposal_substructure.h" -#include "../payloads/sa_payload.h" -#include "../payloads/ke_payload.h" -#include "../payloads/notify_payload.h" -#include "../payloads/nonce_payload.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* * Described in Header diff --git a/Source/charon/testcases/generator_test.h b/Source/charon/testcases/generator_test.h index c83b2a6d9..1182d0380 100644 --- a/Source/charon/testcases/generator_test.h +++ b/Source/charon/testcases/generator_test.h @@ -23,7 +23,7 @@ #ifndef GENERATOR_TEST_H_ #define GENERATOR_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the generator with header payload diff --git a/Source/charon/testcases/hasher_md5_test.c b/Source/charon/testcases/hasher_md5_test.c index a5f9422f3..f1402ad54 100644 --- a/Source/charon/testcases/hasher_md5_test.c +++ b/Source/charon/testcases/hasher_md5_test.c @@ -24,7 +24,7 @@ #include "hasher_md5_test.h" -#include "../utils/allocator.h" +#include /* diff --git a/Source/charon/testcases/hasher_md5_test.h b/Source/charon/testcases/hasher_md5_test.h index 89028dfb3..1af485ec9 100644 --- a/Source/charon/testcases/hasher_md5_test.h +++ b/Source/charon/testcases/hasher_md5_test.h @@ -23,9 +23,9 @@ #ifndef HASHER_MD5_TEST_H_ #define HASHER_MD5_TEST_H_ -#include "../transforms/hashers/hasher.h" -#include "../transforms/hashers/hasher_md5.h" -#include "../utils/tester.h" +#include +#include +#include /** * @brief Test function used to test the md5-hasher functionality diff --git a/Source/charon/testcases/hasher_sha1_test.c b/Source/charon/testcases/hasher_sha1_test.c index 9140c5757..7f4667847 100644 --- a/Source/charon/testcases/hasher_sha1_test.c +++ b/Source/charon/testcases/hasher_sha1_test.c @@ -24,7 +24,7 @@ #include "hasher_sha1_test.h" -#include "../utils/allocator.h" +#include /* diff --git a/Source/charon/testcases/hasher_sha1_test.h b/Source/charon/testcases/hasher_sha1_test.h index a3263784c..34a9d6067 100644 --- a/Source/charon/testcases/hasher_sha1_test.h +++ b/Source/charon/testcases/hasher_sha1_test.h @@ -23,9 +23,9 @@ #ifndef HASHER_SHA1_TEST_H_ #define HASHER_SHA1_TEST_H_ -#include "../transforms/hashers/hasher.h" -#include "../transforms/hashers/hasher_sha1.h" -#include "../utils/tester.h" +#include +#include +#include /** * @brief Test function used to test the sha1-hasher functionality diff --git a/Source/charon/testcases/hmac_test.c b/Source/charon/testcases/hmac_test.c index 3dc36f5a0..8bb75d563 100644 --- a/Source/charon/testcases/hmac_test.c +++ b/Source/charon/testcases/hmac_test.c @@ -24,8 +24,8 @@ #include "hmac_test.h" -#include "../transforms/hmac.h" -#include "../utils/allocator.h" +#include +#include /* diff --git a/Source/charon/testcases/hmac_test.h b/Source/charon/testcases/hmac_test.h index 7907bd79d..f5563fc4b 100644 --- a/Source/charon/testcases/hmac_test.h +++ b/Source/charon/testcases/hmac_test.h @@ -23,8 +23,8 @@ #ifndef HMAC_TEST_H_ #define HMAC_TEST_H_ -#include "../transforms/hmac.h" -#include "../utils/tester.h" +#include +#include /** * @brief Test function used to test the hmac functionality diff --git a/Source/charon/testcases/ike_sa_id_test.c b/Source/charon/testcases/ike_sa_id_test.c index 19c19d88f..e0a0e7a46 100644 --- a/Source/charon/testcases/ike_sa_id_test.c +++ b/Source/charon/testcases/ike_sa_id_test.c @@ -22,7 +22,7 @@ #include "ike_sa_id_test.h" -#include "../ike_sa_id.h" +#include /* * described in Header-File diff --git a/Source/charon/testcases/ike_sa_id_test.h b/Source/charon/testcases/ike_sa_id_test.h index 157fab038..a961d311c 100644 --- a/Source/charon/testcases/ike_sa_id_test.h +++ b/Source/charon/testcases/ike_sa_id_test.h @@ -23,7 +23,7 @@ #ifndef IKE_SA_ID_TEST_H_ #define IKE_SA_ID_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the ike_sa_id functionality diff --git a/Source/charon/testcases/ike_sa_manager_test.c b/Source/charon/testcases/ike_sa_manager_test.c index d91685d7e..c54f5513a 100644 --- a/Source/charon/testcases/ike_sa_manager_test.c +++ b/Source/charon/testcases/ike_sa_manager_test.c @@ -26,8 +26,8 @@ #include "ike_sa_manager_test.h" -#include "../types.h" -#include "../ike_sa_manager.h" +#include +#include static struct ike_sa_manager_test_struct_s { diff --git a/Source/charon/testcases/ike_sa_manager_test.h b/Source/charon/testcases/ike_sa_manager_test.h index 416bb81f3..3129501de 100644 --- a/Source/charon/testcases/ike_sa_manager_test.h +++ b/Source/charon/testcases/ike_sa_manager_test.h @@ -23,7 +23,7 @@ #ifndef IKE_SA_MANAGER_TEST_H_ #define IKE_SA_MANAGER_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the ike_sa_manager_t functionality diff --git a/Source/charon/testcases/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c index 7e97102f4..60496706a 100644 --- a/Source/charon/testcases/ike_sa_test.c +++ b/Source/charon/testcases/ike_sa_test.c @@ -22,9 +22,9 @@ #include "ike_sa_test.h" -#include "../types.h" -#include "../message.h" -#include "../ike_sa.h" +#include +#include +#include void test_ike_sa(tester_t *tester) { diff --git a/Source/charon/testcases/ike_sa_test.h b/Source/charon/testcases/ike_sa_test.h index f6e708f8a..b27244e92 100644 --- a/Source/charon/testcases/ike_sa_test.h +++ b/Source/charon/testcases/ike_sa_test.h @@ -23,7 +23,7 @@ #ifndef IKE_SA_TEST_H_ #define IKE_SA_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the ike_sa_t functionality diff --git a/Source/charon/testcases/job_queue_test.c b/Source/charon/testcases/job_queue_test.c index 4cfd8e553..8590b1e47 100644 --- a/Source/charon/testcases/job_queue_test.c +++ b/Source/charon/testcases/job_queue_test.c @@ -27,8 +27,8 @@ #include "job_queue_test.h" -#include "../utils/allocator.h" -#include "../queues/job_queue.h" +#include +#include typedef struct job_queue_test_s job_queue_test_t; diff --git a/Source/charon/testcases/job_queue_test.h b/Source/charon/testcases/job_queue_test.h index 42c9253ce..380d45592 100644 --- a/Source/charon/testcases/job_queue_test.h +++ b/Source/charon/testcases/job_queue_test.h @@ -23,7 +23,7 @@ #ifndef JOB_QUEUE_TEST_H_ #define JOB_QUEUE_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the job_queue functionality diff --git a/Source/charon/testcases/linked_list_test.c b/Source/charon/testcases/linked_list_test.c index 4418f1e12..46bc797b8 100644 --- a/Source/charon/testcases/linked_list_test.c +++ b/Source/charon/testcases/linked_list_test.c @@ -24,7 +24,7 @@ #include "linked_list_test.h" -#include "../utils/linked_list.h" +#include /* * Description in header-file diff --git a/Source/charon/testcases/linked_list_test.h b/Source/charon/testcases/linked_list_test.h index 3d977d7f1..86046d0f2 100644 --- a/Source/charon/testcases/linked_list_test.h +++ b/Source/charon/testcases/linked_list_test.h @@ -23,7 +23,7 @@ #ifndef LINKED_LIST_TEST_H_ #define LINKED_LIST_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function for the type linked_list_t diff --git a/Source/charon/testcases/packet_test.c b/Source/charon/testcases/packet_test.c index 8bac066dc..aaf2218f5 100644 --- a/Source/charon/testcases/packet_test.c +++ b/Source/charon/testcases/packet_test.c @@ -24,10 +24,10 @@ #include "packet_test.h" -#include "../packet.h" -#include "../globals.h" -#include "../utils/allocator.h" -#include "../utils/logger_manager.h" +#include +#include +#include +#include /* diff --git a/Source/charon/testcases/packet_test.h b/Source/charon/testcases/packet_test.h index f667d5381..98aec76e8 100644 --- a/Source/charon/testcases/packet_test.h +++ b/Source/charon/testcases/packet_test.h @@ -23,7 +23,7 @@ #ifndef PACKET_TEST_H_ #define PACKET_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the packet_t functionality diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c index ef7e07e89..a94ff6486 100644 --- a/Source/charon/testcases/parser_test.c +++ b/Source/charon/testcases/parser_test.c @@ -23,16 +23,16 @@ #include "parser_test.h" -#include "../generator.h" -#include "../parser.h" -#include "../utils/allocator.h" -#include "../utils/logger_manager.h" -#include "../payloads/encodings.h" -#include "../payloads/ike_header.h" -#include "../payloads/sa_payload.h" -#include "../payloads/nonce_payload.h" -#include "../payloads/ke_payload.h" -#include "../payloads/notify_payload.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include extern logger_manager_t *global_logger_manager; diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h index 52c7ee7a0..b5a10623e 100644 --- a/Source/charon/testcases/parser_test.h +++ b/Source/charon/testcases/parser_test.h @@ -22,7 +22,7 @@ #ifndef PARSER_TEST_H_ #define PARSER_TEST_H_ -#include "../utils/tester.h" +#include void test_parser_with_header_payload(tester_t *tester); diff --git a/Source/charon/testcases/prf_plus_test.c b/Source/charon/testcases/prf_plus_test.c index eafdebfd9..c5806fb0b 100644 --- a/Source/charon/testcases/prf_plus_test.c +++ b/Source/charon/testcases/prf_plus_test.c @@ -24,8 +24,8 @@ #include "prf_plus_test.h" -#include "../transforms/prf_plus.h" -#include "../utils/allocator.h" +#include +#include /* diff --git a/Source/charon/testcases/prf_plus_test.h b/Source/charon/testcases/prf_plus_test.h index b55779728..2738c5053 100644 --- a/Source/charon/testcases/prf_plus_test.h +++ b/Source/charon/testcases/prf_plus_test.h @@ -23,8 +23,8 @@ #ifndef PRF_PLUS_TEST_H_ #define PRF_PLUS_TEST_H_ -#include "../transforms/prf_plus.h" -#include "../utils/tester.h" +#include +#include /** * @brief Test function used to test the prf_plus class. diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c index 471659f88..e333d3857 100644 --- a/Source/charon/testcases/receiver_test.c +++ b/Source/charon/testcases/receiver_test.c @@ -25,14 +25,14 @@ #include "receiver_test.h" -#include "../globals.h" -#include "../receiver.h" -#include "../packet.h" -#include "../socket.h" -#include "../queues/send_queue.h" -#include "../queues/job_queue.h" -#include "../payloads/encodings.h" -#include "../utils/allocator.h" +#include +#include +#include +#include +#include +#include +#include +#include /** * Number of packets to send by sender-thread diff --git a/Source/charon/testcases/receiver_test.h b/Source/charon/testcases/receiver_test.h index 85c518b36..683ac5109 100644 --- a/Source/charon/testcases/receiver_test.h +++ b/Source/charon/testcases/receiver_test.h @@ -23,7 +23,7 @@ #ifndef RECEIVER_TEST_H_ #define RECEIVER_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function for the type receiver_t diff --git a/Source/charon/testcases/scheduler_test.c b/Source/charon/testcases/scheduler_test.c index 89f151a38..76011156f 100644 --- a/Source/charon/testcases/scheduler_test.c +++ b/Source/charon/testcases/scheduler_test.c @@ -25,10 +25,10 @@ #include "scheduler_test.h" -#include "../globals.h" -#include "../scheduler.h" -#include "../queues/event_queue.h" -#include "../queues/job_queue.h" +#include +#include +#include +#include /** diff --git a/Source/charon/testcases/scheduler_test.h b/Source/charon/testcases/scheduler_test.h index baf7ce24d..8d813b43d 100644 --- a/Source/charon/testcases/scheduler_test.h +++ b/Source/charon/testcases/scheduler_test.h @@ -23,7 +23,7 @@ #ifndef SCHEDULER_TEST_H_ #define SCHEDULER_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function for the type scheduler_t diff --git a/Source/charon/testcases/send_queue_test.c b/Source/charon/testcases/send_queue_test.c index 00a067204..24b3ada9c 100644 --- a/Source/charon/testcases/send_queue_test.c +++ b/Source/charon/testcases/send_queue_test.c @@ -24,7 +24,7 @@ #include "send_queue_test.h" -#include "../queues/send_queue.h" +#include /** diff --git a/Source/charon/testcases/send_queue_test.h b/Source/charon/testcases/send_queue_test.h index 81b6ff2dd..73b8a5c8e 100644 --- a/Source/charon/testcases/send_queue_test.h +++ b/Source/charon/testcases/send_queue_test.h @@ -23,7 +23,7 @@ #ifndef SEND_QUEUE_TEST_H_ #define SEND_QUEUE_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function used to test the send_queue functionality diff --git a/Source/charon/testcases/sender_test.c b/Source/charon/testcases/sender_test.c index 226be917d..c90eb9d7e 100644 --- a/Source/charon/testcases/sender_test.c +++ b/Source/charon/testcases/sender_test.c @@ -24,13 +24,13 @@ #include "sender_test.h" -#include "../globals.h" -#include "../sender.h" -#include "../packet.h" -#include "../socket.h" -#include "../queues/send_queue.h" -#include "../queues/job_queue.h" -#include "../utils/allocator.h" +#include +#include +#include +#include +#include +#include +#include /** * Number of packets to send by sender-thread diff --git a/Source/charon/testcases/sender_test.h b/Source/charon/testcases/sender_test.h index 1ee782f72..abef07d0c 100644 --- a/Source/charon/testcases/sender_test.h +++ b/Source/charon/testcases/sender_test.h @@ -23,7 +23,7 @@ #ifndef SENDER_TEST_H_ #define SENDER_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function for the type sender_t diff --git a/Source/charon/testcases/socket_test.c b/Source/charon/testcases/socket_test.c index df0ebe373..d73be702c 100644 --- a/Source/charon/testcases/socket_test.c +++ b/Source/charon/testcases/socket_test.c @@ -25,8 +25,8 @@ #include "socket_test.h" -#include "../socket.h" -#include "../utils/allocator.h" +#include +#include /* * Description in header file diff --git a/Source/charon/testcases/socket_test.h b/Source/charon/testcases/socket_test.h index 2911f104d..59569f61d 100644 --- a/Source/charon/testcases/socket_test.h +++ b/Source/charon/testcases/socket_test.h @@ -23,7 +23,7 @@ #ifndef SOCKET_TEST_H_ #define SOCKET_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function for the type socket_t diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c index 8fcda2f27..52b25db68 100644 --- a/Source/charon/testcases/testcases.c +++ b/Source/charon/testcases/testcases.c @@ -23,35 +23,35 @@ #include -#include "../queues/job_queue.h" -#include "../queues/event_queue.h" -#include "../queues/send_queue.h" -#include "../configuration_manager.h" -#include "../ike_sa_manager.h" -#include "../socket.h" -#include "../utils/logger_manager.h" -#include "../utils/allocator.h" -#include "../utils/tester.h" -#include "linked_list_test.h" -#include "thread_pool_test.h" -#include "job_queue_test.h" -#include "event_queue_test.h" -#include "send_queue_test.h" -#include "socket_test.h" -#include "sender_test.h" -#include "scheduler_test.h" -#include "receiver_test.h" -#include "ike_sa_id_test.h" -#include "ike_sa_test.h" -#include "ike_sa_manager_test.h" -#include "generator_test.h" -#include "parser_test.h" -#include "packet_test.h" -#include "diffie_hellman_test.h" -#include "hasher_sha1_test.h" -#include "hasher_md5_test.h" -#include "hmac_test.h" -#include "prf_plus_test.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* output for test messages */ diff --git a/Source/charon/testcases/thread_pool_test.c b/Source/charon/testcases/thread_pool_test.c index e0c0e24a2..dec0cf81c 100644 --- a/Source/charon/testcases/thread_pool_test.c +++ b/Source/charon/testcases/thread_pool_test.c @@ -24,7 +24,7 @@ #include "thread_pool_test.h" -#include "../thread_pool.h" +#include /* * Description in header file diff --git a/Source/charon/testcases/thread_pool_test.h b/Source/charon/testcases/thread_pool_test.h index a05146a8b..ea29f104c 100644 --- a/Source/charon/testcases/thread_pool_test.h +++ b/Source/charon/testcases/thread_pool_test.h @@ -23,7 +23,7 @@ #ifndef THREAD_POOL_TEST_H_ #define THREAD_POOL_TEST_H_ -#include "../utils/tester.h" +#include /** * @brief Test function for the type thread_pool_t -- 2.39.2