projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ListNames and ListQueuedOwners updated to work with new kdbus
[platform/upstream/dbus.git]
/
dbus
/
dbus-test.c
diff --git
a/dbus/dbus-test.c
b/dbus/dbus-test.c
index
b2eeb72
..
b707ee2
100644
(file)
--- a/
dbus/dbus-test.c
+++ b/
dbus/dbus-test.c
@@
-28,7
+28,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#ifdef DBUS_
BUIL
D_TESTS
+#ifdef DBUS_
ENABLE_EMBEDDE
D_TESTS
static void
die (const char *failure)
{
static void
die (const char *failure)
{
@@
-63,9
+63,9
@@
run_test (const char *test_name,
printf ("%s: running %s tests\n", "dbus-test", test_name);
if (!test ())
die (test_name);
printf ("%s: running %s tests\n", "dbus-test", test_name);
if (!test ())
die (test_name);
- }
- check_memleaks ();
+ check_memleaks ();
+ }
}
static void
}
static void
@@
-79,12
+79,12
@@
run_data_test (const char *test_name,
printf ("%s: running %s tests\n", "dbus-test", test_name);
if (!test (test_data_dir))
die (test_name);
printf ("%s: running %s tests\n", "dbus-test", test_name);
if (!test (test_data_dir))
die (test_name);
- }
- check_memleaks ();
+ check_memleaks ();
+ }
}
}
-#endif /* DBUS_
BUIL
D_TESTS */
+#endif /* DBUS_
ENABLE_EMBEDDE
D_TESTS */
/**
* An exported symbol to be run in order to execute
/**
* An exported symbol to be run in order to execute
@@
-94,11
+94,12
@@
run_data_test (const char *test_name,
* (with --enable-tests=no)
*
* @param test_data_dir the directory with test data (test/data normally)
* (with --enable-tests=no)
*
* @param test_data_dir the directory with test data (test/data normally)
+ * @param specific_test run specific test or #NULL to run all tests
*/
void
dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *specific_test)
{
*/
void
dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *specific_test)
{
-#ifdef DBUS_
BUIL
D_TESTS
+#ifdef DBUS_
ENABLE_EMBEDDE
D_TESTS
if (!_dbus_threads_init_debug ())
die ("debug threads init");
if (!_dbus_threads_init_debug ())
die ("debug threads init");
@@
-128,15
+129,7
@@
dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *speci
run_test ("marshalling", specific_test, _dbus_marshal_test);
run_test ("marshalling", specific_test, _dbus_marshal_test);
-#if 0
- printf ("%s: running recursive marshalling tests\n", "dbus-test");
- if (!_dbus_marshal_recursive_test ())
- die ("recursive marshal");
-
- check_memleaks ();
-#else
- printf ("SKIP: recursive marshal tests disabled\n");
-#endif
+ run_test ("marshal-recursive", specific_test, _dbus_marshal_recursive_test);
run_test ("byteswap", specific_test, _dbus_marshal_byteswap_test);
run_test ("byteswap", specific_test, _dbus_marshal_byteswap_test);
@@
-162,6
+155,8
@@
dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *speci
#ifdef DBUS_UNIX
run_data_test ("userdb", specific_test, _dbus_userdb_test, test_data_dir);
#ifdef DBUS_UNIX
run_data_test ("userdb", specific_test, _dbus_userdb_test, test_data_dir);
+
+ run_test ("transport-unix", specific_test, _dbus_transport_unix_test);
#endif
run_test ("keyring", specific_test, _dbus_keyring_test);
#endif
run_test ("keyring", specific_test, _dbus_keyring_test);