fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-20 03:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests to embedded tests: replaced in libdbus

Browse source 
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66291
This commit is contained in:
Chengwei Yang 2013-06-28 16:25:54 +08:00 • committed by Simon McVittie
parent 11c5dc126e
commit 4df8738794
43 changed files with 123 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dbus/dbus-address.c
View file

@ -648,7 +648,7 @@ dbus_address_unescape_value (const char *value,
/** @} */ /* End of public API */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#ifndef DOXYGEN_SHOULD_SKIP_THIS

4
dbus/dbus-auth-script.c
View file

@ -22,7 +22,7 @@
*/
#include <config.h>
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-auth-script.h"
#include "dbus-auth.h"
@ -800,4 +800,4 @@ _dbus_auth_script_run (const DBusString *filename)
}
/** @} */
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-auth-util.c
View file

@ -33,7 +33,7 @@
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include "dbus-auth-script.h"
#include <stdio.h>
@ -167,4 +167,4 @@ _dbus_auth_test (const char *test_data_dir)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

2
dbus/dbus-connection-internal.h
View file

@ -115,7 +115,7 @@ void _dbus_connection_get_stats (DBusConnection *connection,
dbus_uint32_t *out_peak_fds);
/* if DBUS_BUILD_TESTS */
/* if DBUS_ENABLE_EMBEDDED_TESTS */
const char* _dbus_connection_get_address (DBusConnection *connection);
/* This _dbus_bus_* stuff doesn't really belong here, but dbus-bus-internal.h seems

4
dbus/dbus-connection.c
View file

@ -446,7 +446,7 @@ _dbus_connection_wakeup_mainloop (DBusConnection *connection)
(*connection->wakeup_main_function) (connection->wakeup_main_data);
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* Gets the locks so we can examine them
*
@ -6283,7 +6283,7 @@ dbus_connection_get_outgoing_unix_fds (DBusConnection *connection)
return res;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* Returns the address of the transport object of this connection
*

4
dbus/dbus-credentials-util.c
View file

@ -33,7 +33,7 @@
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
#include <string.h>
@ -203,4 +203,4 @@ _dbus_credentials_test (const char *test_data_dir)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-dataslot.c
View file

@ -348,7 +348,7 @@ _dbus_data_slot_list_free (DBusDataSlotList *list)
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
@ -459,4 +459,4 @@ _dbus_data_slot_test (void)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-hash.c
View file

@ -1401,7 +1401,7 @@ _dbus_hash_table_get_n_entries (DBusHashTable *table)
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
@ -1828,4 +1828,4 @@ _dbus_hash_test (void)
return ret;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

6
dbus/dbus-internals.c
View file

@ -861,7 +861,7 @@ _dbus_get_local_machine_uuid_encoded (DBusString *uuid_str)
if (!_dbus_read_local_machine_uuid (&machine_uuid, FALSE,
&error))
{
#ifndef DBUS_BUILD_TESTS
#ifndef DBUS_ENABLE_EMBEDDED_TESTS
/* For the test suite, we may not be installed so just continue silently
* here. But in a production build, we want to be nice and loud about
* this.
@ -940,7 +940,7 @@ _dbus_real_assert_not_reached (const char *explanation,
}
#endif /* DBUS_DISABLE_ASSERT */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
static dbus_bool_t
run_failing_each_malloc (int n_mallocs,
const char *description,
@ -1035,6 +1035,6 @@ _dbus_test_oom_handling (const char *description,
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
/** @} */

4
dbus/dbus-internals.h
View file

@ -266,7 +266,7 @@ void _dbus_verbose_bytes_of_string (const DBusString *str,
extern const char *_dbus_no_memory_message;
#define _DBUS_SET_OOM(error) dbus_set_error_const ((error), DBUS_ERROR_NO_MEMORY, _dbus_no_memory_message)
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/* Memory debugging */
void _dbus_set_fail_alloc_counter (int until_next_fail);
int _dbus_get_fail_alloc_counter (void);
@ -290,7 +290,7 @@ dbus_bool_t _dbus_test_oom_handling (const char *description,
#define _dbus_decrement_fail_alloc_counter() (FALSE)
#define _dbus_disable_mem_pools() (FALSE)
#define _dbus_get_malloc_blocks_outstanding (0)
#endif /* !DBUS_BUILD_TESTS */
#endif /* !DBUS_ENABLE_EMBEDDED_TESTS */
typedef void (* DBusShutdownFunction) (void *data);
dbus_bool_t _dbus_register_shutdown_func (DBusShutdownFunction function,

6
dbus/dbus-keyring.c
View file

@ -80,7 +80,7 @@
* Maximum number of keys in the keyring before
* we just ignore the rest
*/
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#define MAX_KEYS_IN_FILE 10
#else
#define MAX_KEYS_IN_FILE 256
@ -1023,7 +1023,7 @@ _dbus_keyring_get_hex_key (DBusKeyring *keyring,
/** @} */ /* end of exposed API */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
@ -1156,5 +1156,5 @@ _dbus_keyring_test (void)
return FALSE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

2
dbus/dbus-list.c
View file

@ -788,7 +788,7 @@ _dbus_list_length_is_one (DBusList **list)
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>

2
dbus/dbus-mainloop.c
View file

@ -922,7 +922,7 @@ _dbus_loop_quit (DBusLoop *loop)
int
_dbus_get_oom_wait (void)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/* make tests go fast */
return 0;
#else

4
dbus/dbus-marshal-basic.c
View file

@ -1501,7 +1501,7 @@ _dbus_first_type_in_signature_c_str (const char *str,
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
@ -1992,4 +1992,4 @@ _dbus_marshal_test (void)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-marshal-byteswap-util.c
View file

@ -23,7 +23,7 @@
#include <config.h>
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-marshal-byteswap.h"
#include "dbus-test.h"
#include <stdio.h>
@ -102,4 +102,4 @@ _dbus_marshal_byteswap_test (void)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-marshal-recursive-util.c
View file

@ -23,7 +23,7 @@
#include <config.h>
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-marshal-recursive.h"
#include "dbus-marshal-basic.h"
@ -3574,4 +3574,4 @@ container_destroy (TestTypeNode *node)
#endif /* !DOXYGEN_SHOULD_SKIP_THIS */
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-marshal-validate-util.c
View file

@ -22,7 +22,7 @@
*/
#include <config.h>
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#ifndef DOXYGEN_SHOULD_SKIP_THIS
@ -585,4 +585,4 @@ _dbus_marshal_validate_test (void)
#endif /* !DOXYGEN_SHOULD_SKIP_THIS */
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

30
dbus/dbus-memory.c
View file

@ -97,7 +97,7 @@
* @{
*/
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
static dbus_bool_t debug_initialized = FALSE;
static int fail_nth = -1;
static size_t fail_size = 0;
@ -240,7 +240,7 @@ _dbus_get_fail_alloc_failures (void)
return n_failures_per_failure;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* Called when about to alloc some memory; if
* it returns #TRUE, then the allocation should
@ -294,7 +294,7 @@ _dbus_decrement_fail_alloc_counter (void)
return FALSE;
}
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
/**
* Get the number of outstanding malloc()'d blocks.
@ -460,7 +460,7 @@ set_guards (void *real_block,
void*
dbus_malloc (size_t bytes)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
_dbus_initialize_malloc_debug ();
if (_dbus_decrement_fail_alloc_counter ())
@ -472,7 +472,7 @@ dbus_malloc (size_t bytes)
if (bytes == 0) /* some system mallocs handle this, some don't */
return NULL;
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
else if (fail_size != 0 && bytes > fail_size)
return NULL;
else if (guards)
@ -499,7 +499,7 @@ dbus_malloc (size_t bytes)
void *mem;
mem = malloc (bytes);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (mem)
{
_dbus_atomic_inc (&n_blocks_outstanding);
@ -530,7 +530,7 @@ dbus_malloc (size_t bytes)
void*
dbus_malloc0 (size_t bytes)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
_dbus_initialize_malloc_debug ();
if (_dbus_decrement_fail_alloc_counter ())
@ -543,7 +543,7 @@ dbus_malloc0 (size_t bytes)
if (bytes == 0)
return NULL;
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
else if (fail_size != 0 && bytes > fail_size)
return NULL;
else if (guards)
@ -571,7 +571,7 @@ dbus_malloc0 (size_t bytes)
void *mem;
mem = calloc (bytes, 1);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (mem)
{
_dbus_atomic_inc (&n_blocks_outstanding);
@ -601,7 +601,7 @@ void*
dbus_realloc (void *memory,
size_t bytes)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
_dbus_initialize_malloc_debug ();
if (_dbus_decrement_fail_alloc_counter ())
@ -617,7 +617,7 @@ dbus_realloc (void *memory,
dbus_free (memory);
return NULL;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
else if (fail_size != 0 && bytes > fail_size)
return NULL;
else if (guards)
@ -677,7 +677,7 @@ dbus_realloc (void *memory,
void *mem;
mem = realloc (memory, bytes);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (mem == NULL && malloc_cannot_fail)
{
_dbus_warn ("out of memory: malloc (%ld)\n", (long) bytes);
@ -700,7 +700,7 @@ dbus_realloc (void *memory,
void
dbus_free (void *memory)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (guards)
{
check_guards (memory, TRUE);
@ -724,7 +724,7 @@ dbus_free (void *memory)
if (memory) /* we guarantee it's safe to free (NULL) */
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#ifdef DBUS_DISABLE_ASSERT
_dbus_atomic_dec (&n_blocks_outstanding);
#else
@ -912,7 +912,7 @@ dbus_shutdown (void)
/** @} */ /** End of public API docs block */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
/**

14
dbus/dbus-mempool.c
View file

@ -213,7 +213,7 @@ _dbus_mem_pool_free (DBusMemPool *pool)
void*
_dbus_mem_pool_alloc (DBusMemPool *pool)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (_dbus_disable_mem_pools ())
{
DBusMemBlock *block;
@ -280,7 +280,7 @@ _dbus_mem_pool_alloc (DBusMemPool *pool)
/* Need a new block */
DBusMemBlock *block;
int alloc_size;
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
int saved_counter;
#endif
@ -294,7 +294,7 @@ _dbus_mem_pool_alloc (DBusMemPool *pool)
alloc_size = sizeof (DBusMemBlock) - ELEMENT_PADDING + pool->block_size;
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/* We save/restore the counter, so that memory pools won't
* cause a given function to have different number of
* allocations on different invocations. i.e. when testing
@ -310,7 +310,7 @@ _dbus_mem_pool_alloc (DBusMemPool *pool)
else
block = dbus_malloc (alloc_size);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
_dbus_set_fail_alloc_counter (saved_counter);
_dbus_assert (saved_counter == _dbus_get_fail_alloc_counter ());
#endif
@ -349,7 +349,7 @@ _dbus_mem_pool_dealloc (DBusMemPool *pool,
{
VALGRIND_MEMPOOL_FREE (pool, element);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (_dbus_disable_mem_pools ())
{
DBusMemBlock *block;
@ -449,7 +449,7 @@ _dbus_mem_pool_get_stats (DBusMemPool *pool,
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
#include <time.h>
@ -644,4 +644,4 @@ _dbus_mem_pool_test (void)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-message-factory.c
View file

@ -24,7 +24,7 @@
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-message-factory.h"
#include "dbus-message-private.h"
#include "dbus-signature.h"
@ -1302,4 +1302,4 @@ _dbus_message_data_iter_get_and_next (DBusMessageDataIter *iter,
#endif /* !DOXYGEN_SHOULD_SKIP_THIS */
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-message-factory.h
View file

@ -24,7 +24,7 @@
#ifndef DBUS_MESSAGE_FACTORY_H
#define DBUS_MESSAGE_FACTORY_H
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include <dbus/dbus-string.h>
#include <dbus/dbus-marshal-basic.h>
@ -56,6 +56,6 @@ dbus_bool_t _dbus_message_data_iter_get_and_next (DBusMessageDataIter *iter,
DBUS_END_DECLS
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
#endif /* DBUS_MESSAGE_FACTORY_H */

8
dbus/dbus-message-util.c
View file

@ -45,7 +45,7 @@
* @{
*/
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* Reads arguments from a message iterator given a variable argument
* list. Only arguments of basic type and arrays of fixed-length
@ -76,11 +76,11 @@ dbus_message_iter_get_args (DBusMessageIter *iter,
return retval;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include "dbus-message-factory.h"
#include <stdio.h>
@ -1542,4 +1542,4 @@ _dbus_message_test (const char *test_data_dir)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

2
dbus/dbus-message.c
View file

@ -56,7 +56,7 @@ static void dbus_message_finalize (DBusMessage *message);
* @{
*/
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
static dbus_bool_t
_dbus_enable_message_cache (void)
{

2
dbus/dbus-misc.c
View file

@ -173,7 +173,7 @@ dbus_get_version (int *major_version_p,
/** @} */ /* End of public API */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#ifndef DOXYGEN_SHOULD_SKIP_THIS

28
dbus/dbus-object-tree.c
View file

@ -503,7 +503,7 @@ unlock:
connection = tree->connection;
/* Unlock and call application code */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (connection)
#endif
{
@ -515,7 +515,7 @@ unlock:
if (unregister_function)
(* unregister_function) (connection, user_data);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (connection)
#endif
dbus_connection_unref (connection);
@ -638,7 +638,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree,
DBUS_INTERFACE_INTROSPECTABLE,
"Introspect"))
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -653,7 +653,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree,
if (!_dbus_string_init (&xml))
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -698,7 +698,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree,
if (!dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &v_STRING))
goto out;
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -711,7 +711,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree,
result = DBUS_HANDLER_RESULT_HANDLED;
out:
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -762,7 +762,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree,
path = NULL;
if (!dbus_message_get_path_decomposed (message, &path))
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -777,7 +777,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree,
if (path == NULL)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -846,7 +846,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree,
_dbus_verbose (" (invoking a handler)\n");
#endif
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -863,7 +863,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree,
message,
user_data);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
_dbus_connection_lock (tree->connection);
@ -886,7 +886,7 @@ _dbus_object_tree_dispatch_and_unlock (DBusObjectTree *tree,
}
else
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -1057,7 +1057,7 @@ _dbus_object_tree_list_registered_and_unlock (DBusObjectTree *tree,
parent_path,
child_entries);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (tree->connection)
#endif
{
@ -1214,7 +1214,7 @@ flatten_path (const char **path)
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#ifndef DOXYGEN_SHOULD_SKIP_THIS
@ -1962,4 +1962,4 @@ _dbus_object_tree_test (void)
#endif /* !DOXYGEN_SHOULD_SKIP_THIS */
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-server-debug-pipe.c
View file

@ -31,7 +31,7 @@
#include "dbus-string.h"
#include "dbus-protocol.h"
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* @defgroup DBusServerDebugPipe DBusServerDebugPipe
@ -427,5 +427,5 @@ _dbus_transport_open_debug_pipe (DBusAddressEntry *entry,
/** @} */
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

8
dbus/dbus-server.c
View file

@ -26,7 +26,7 @@
#include "dbus-server-unix.h"
#include "dbus-server-socket.h"
#include "dbus-string.h"
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-server-debug-pipe.h"
#endif
#include "dbus-address.h"
@ -529,7 +529,7 @@ static const struct {
} listen_funcs[] = {
{ _dbus_server_listen_socket }
, { _dbus_server_listen_platform_specific }
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
, { _dbus_server_listen_debug_pipe }
#endif
};
@ -1188,7 +1188,7 @@ dbus_server_get_data (DBusServer *server,
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <string.h>
@ -1244,4 +1244,4 @@ _dbus_server_test (void)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-sha.c
View file

@ -511,7 +511,7 @@ _dbus_sha_compute (const DBusString *data,
/** @} */ /* end of exported functions */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
@ -966,4 +966,4 @@ _dbus_sha_test (const char *test_data_dir)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

2
dbus/dbus-signature.c
View file

@ -410,7 +410,7 @@ dbus_type_is_valid (int typecode)
/** @} */ /* end of DBusSignature group */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* @ingroup DBusSignatureInternals

2
dbus/dbus-socket-set-poll.c
View file

@ -44,7 +44,7 @@ typedef struct {
#define MINIMUM_SIZE 8
/* If we're in the regression tests, force reallocation to happen sooner */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#define DEFAULT_SIZE_HINT 1
#else
#define DEFAULT_SIZE_HINT MINIMUM_SIZE

10
dbus/dbus-spawn-win.c
View file

@ -63,7 +63,7 @@ struct DBusBabysitter
int refcount;
HANDLE start_sync_event;
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
HANDLE end_sync_event;
#endif
@ -109,7 +109,7 @@ _dbus_babysitter_new (void)
return NULL;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
sitter->end_sync_event = CreateEvent (NULL, FALSE, FALSE, NULL);
if (sitter->end_sync_event == NULL)
{
@ -250,7 +250,7 @@ _dbus_babysitter_unref (DBusBabysitter *sitter)
sitter->start_sync_event = NULL;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (sitter->end_sync_event != NULL)
{
CloseHandle (sitter->end_sync_event);
@ -628,7 +628,7 @@ babysitter (void *parameter)
sitter->child_handle = NULL;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
SetEvent (sitter->end_sync_event);
#endif
@ -753,7 +753,7 @@ _dbus_babysitter_set_result_function (DBusBabysitter *sitter,
sitter->finished_data = user_data;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
static char *
get_test_exec (const char *exe,

6
dbus/dbus-spawn.c
View file

@ -936,7 +936,7 @@ do_exec (int child_err_report_fd,
DBusSpawnChildSetupFunc child_setup,
void *user_data)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
int i, max_open;
#endif
@ -947,7 +947,7 @@ do_exec (int child_err_report_fd,
if (child_setup)
(* child_setup) (user_data);
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
max_open = sysconf (_SC_OPEN_MAX);
for (i = 3; i < max_open; i++)
@ -1325,7 +1325,7 @@ _dbus_babysitter_set_result_function (DBusBabysitter *sitter,
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
static char *
get_test_exec (const char *exe,

4
dbus/dbus-string-util.c
View file

@ -115,7 +115,7 @@ _dbus_string_find_byte_backward (const DBusString *str,
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-test.h"
#include <stdio.h>
@ -935,4 +935,4 @@ _dbus_string_test (void)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

16
dbus/dbus-string.c
View file

@ -285,9 +285,9 @@ compact (DBusRealString *real,
return TRUE;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/* Not using this feature at the moment,
* so marked DBUS_BUILD_TESTS-only
* so marked DBUS_ENABLE_EMBEDDED_TESTS-only
*/
/**
* Locks a string such that any attempts to change the string will
@ -311,7 +311,7 @@ _dbus_string_lock (DBusString *str)
#define MAX_WASTE 48
compact (real, MAX_WASTE);
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
static dbus_bool_t
reallocate_for_length (DBusRealString *real,
@ -337,11 +337,11 @@ reallocate_for_length (DBusRealString *real,
*/
#ifdef DBUS_DISABLE_ASSERT
#else
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
new_allocated = 0; /* ensure a realloc every time so that we go
* through all malloc failure codepaths
*/
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
#endif /* !DBUS_DISABLE_ASSERT */
/* But be sure we always alloc at least space for the new length */
@ -1904,7 +1904,7 @@ _dbus_string_skip_white_reverse (const DBusString *str,
* @todo owen correctly notes that this is a stupid function (it was
* written purely for test code,
* e.g. dbus-message-builder.c). Probably should be enforced as test
* code only with ifdef DBUS_BUILD_TESTS
* code only with ifdef DBUS_ENABLE_EMBEDDED_TESTS
*
* @param source the source string
* @param dest the destination string (contents are replaced)
@ -1948,7 +1948,7 @@ _dbus_string_pop_line (DBusString *source,
return TRUE;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* Deletes up to and including the first blank space
* in the string.
@ -1967,7 +1967,7 @@ _dbus_string_delete_first_word (DBusString *str)
}
#endif
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* Deletes any leading blanks in the string
*

2
dbus/dbus-sysdeps-unix.c
View file

@ -3923,7 +3923,7 @@ _dbus_append_keyring_directory_for_credentials (DBusString *directory,
if (!_dbus_homedir_from_uid (uid, &homedir))
goto failed;
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
{
const char *override;

4
dbus/dbus-sysdeps-util.c
View file

@ -80,7 +80,7 @@ _dbus_get_environment (void)
return environment;
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
static void
check_dirname (const char *filename,
const char *dirname)
@ -196,4 +196,4 @@ _dbus_sysdeps_test (void)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-sysdeps-win.c
View file

@ -2221,7 +2221,7 @@ _dbus_replace_install_prefix (const char *configure_time_path)
#endif
}
#if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_BUILD_TESTS)
#if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_ENABLE_EMBEDDED_TESTS)
#if defined(_MSC_VER) || defined(DBUS_WINCE)
# ifdef BACKTRACES
@ -3457,7 +3457,7 @@ _dbus_append_keyring_directory_for_credentials (DBusString *directory,
_dbus_string_append(&homedir,homepath);
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
{
const char *override;

6
dbus/dbus-test.c
View file

@ -28,7 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
static void
die (const char *failure)
{
@ -84,7 +84,7 @@ run_data_test (const char *test_name,
}
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
/**
* An exported symbol to be run in order to execute
@ -98,7 +98,7 @@ run_data_test (const char *test_name,
void
dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *specific_test)
{
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
if (!_dbus_threads_init_debug ())
die ("debug threads init");

4
dbus/dbus-threads.c
View file

@ -457,7 +457,7 @@ dbus_threads_init_default (void)
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
dbus_bool_t
_dbus_threads_init_debug (void)
@ -465,4 +465,4 @@ _dbus_threads_init_debug (void)
return dbus_threads_init (NULL);
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

2
dbus/dbus-transport-unix.c
View file

@ -412,7 +412,7 @@ _dbus_transport_open_platform_specific (DBusAddressEntry *entry,
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
dbus_bool_t
_dbus_transport_unix_test (void)

4
dbus/dbus-transport.c
View file

@ -32,7 +32,7 @@
#include "dbus-credentials.h"
#include "dbus-mainloop.h"
#include "dbus-message.h"
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-server-debug-pipe.h"
#endif
@ -348,7 +348,7 @@ static const struct {
{ _dbus_transport_open_socket },
{ _dbus_transport_open_platform_specific },
{ _dbus_transport_open_autolaunch }
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
, { _dbus_transport_open_debug_pipe }
#endif
};

4
dbus/dbus-userdb-util.c
View file

@ -437,7 +437,7 @@ _dbus_groups_from_uid (dbus_uid_t uid,
}
/** @} */
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include <stdio.h>
/**
@ -490,4 +490,4 @@ _dbus_userdb_test (const char *test_data_dir)
return TRUE;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

4
dbus/dbus-userdb.c
View file

@ -602,7 +602,7 @@ _dbus_user_database_flush (DBusUserDatabase *db)
_dbus_hash_table_remove_all(db->groups);
}
#ifdef DBUS_BUILD_TESTS
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/**
* Increments refcount of user database.
* @param db the database
@ -617,7 +617,7 @@ _dbus_user_database_ref (DBusUserDatabase *db)
return db;
}
#endif /* DBUS_BUILD_TESTS */
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */
/**
* Decrements refcount of user database.