diff libpurple/tests/check_libpurple.c @ 29345:13fa0fffac6d

merge of '1529fa495883d559527375c0d8b7fbe68cf019c2' and '3e607deb45a1ba0c62a1b8f376d94b2751ec8343'
author Paul Aurich <paul@darkrain42.org>
date Sat, 09 Jan 2010 02:00:18 +0000
parents c0c24f947211
children a40c55113f7d
line wrap: on
line diff
--- a/libpurple/tests/check_libpurple.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/tests/check_libpurple.c	Sat Jan 09 02:00:18 2010 +0000
@@ -44,7 +44,7 @@
 	purple_eventloop_set_ui_ops(&eventloop_ui_ops);
 
 	/* build our fake home directory */
-	home_dir = g_build_path(BUILDDIR, "libpurple", "tests", "home", NULL);
+	home_dir = g_build_path(G_DIR_SEPARATOR_S, BUILDDIR, "libpurple", "tests", "home", NULL);
 	purple_util_set_user_dir(home_dir);
 	g_free(home_dir);
 
@@ -67,6 +67,9 @@
 	int number_failed;
 	SRunner *sr;
 
+	if (g_getenv("PURPLE_CHECK_DEBUG"))
+		purple_debug_set_enabled(TRUE);
+
 	/* Make g_return_... functions fatal, ALWAYS.
 	 * As this is the test code, this is NOT controlled
 	 * by PURPLE_FATAL_ASSERTS. */
@@ -76,6 +79,7 @@
 
 	srunner_add_suite(sr, cipher_suite());
 	srunner_add_suite(sr, jabber_jutil_suite());
+	srunner_add_suite(sr, jabber_scram_suite());
 	srunner_add_suite(sr, qq_suite());
 	srunner_add_suite(sr, yahoo_util_suite());
 	srunner_add_suite(sr, util_suite());