/pidgin/main: 16077644ca50: Clean up the remaining stuff from check

Changeset: 16077644ca50172e9b741300b6f53db7ada6b518
Author:	 Gary Kramlich <[email protected]>
Date:	 2016-03-13 18:12 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/16077644ca50

Description:

Clean up the remaining stuff from check

diffstat:

 libpurple/tests/check_libpurple.c |  107 --------------------------------------
 libpurple/tests/tests.h           |   40 --------------
 2 files changed, 0 insertions(+), 147 deletions(-)

diffs (157 lines):

diff --git a/libpurple/tests/check_libpurple.c b/libpurple/tests/check_libpurple.c
deleted file mode 100644
--- a/libpurple/tests/check_libpurple.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#include <glib.h>
-#include <stdlib.h>
-
-#include "tests.h"
-
-#include "../core.h"
-#include "../eventloop.h"
-#include "../util.h"
-
-
-/******************************************************************************
- * libpurple goodies
- *****************************************************************************/
-static guint
-purple_check_input_add(gint fd, PurpleInputCondition condition,
-                     PurpleInputFunction function, gpointer data)
-{
-	/* this is a no-op for now, feel free to implement it */
-	return 0;
-}
-
-static PurpleEventLoopUiOps eventloop_ui_ops = {
-	g_timeout_add,
-	g_source_remove,
-	purple_check_input_add,
-	g_source_remove,
-	NULL, /* input_get_error */
-	g_timeout_add_seconds,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-static void
-purple_check_init(void) {
-#if !GLIB_CHECK_VERSION(2, 36, 0)
-	/* GLib type system is automaticaly initialized since 2.36. */
-	g_type_init();
-#endif
-
-	purple_eventloop_set_ui_ops(&eventloop_ui_ops);
-
-#if 0
-	/* build our fake home directory */
-	{
-		gchar *home_dir;
-
-		home_dir = g_build_path(G_DIR_SEPARATOR_S, $(top_builddir), "libpurple", "tests", "home", NULL);
-		purple_util_set_user_dir(home_dir);
-		g_free(home_dir);
-	}
-#else
-	purple_util_set_user_dir("/dev/null");
-#endif
-
-	purple_core_init("check");
-}
-
-/******************************************************************************
- * Check meat and potatoes
- *****************************************************************************/
-Suite*
-master_suite(void)
-{
-	Suite *s = suite_create("Master Suite");
-
-	return s;
-}
-
-int main(void)
-{
-	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. */
-	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-
-	sr = srunner_create (master_suite());
-
-	srunner_add_suite(sr, cipher_suite());
-	srunner_add_suite(sr, jabber_caps_suite());
-	srunner_add_suite(sr, jabber_digest_md5_suite());
-	srunner_add_suite(sr, jabber_jutil_suite());
-	srunner_add_suite(sr, jabber_scram_suite());
-	srunner_add_suite(sr, oscar_util_suite());
-	srunner_add_suite(sr, yahoo_util_suite());
-	srunner_add_suite(sr, util_suite());
-	srunner_add_suite(sr, purple_xmlnode_suite());
-	srunner_add_suite(sr, purple_trie_suite());
-
-	/* make this a libpurple "ui" */
-	purple_check_init();
-
-	srunner_run_all (sr, CK_NORMAL);
-	number_failed = srunner_ntests_failed (sr);
-	srunner_free (sr);
-
-	purple_core_quit();
-
-	return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/libpurple/tests/tests.h b/libpurple/tests/tests.h
deleted file mode 100644
--- a/libpurple/tests/tests.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef TESTS_H
-#  define TESTS_H
-
-#include "../purple.h"
-
-#include <check.h>
-
-/* define the test suites here */
-/* remember to add the suite to the runner in check_libpurple.c */
-Suite * master_suite(void);
-Suite * cipher_suite(void);
-Suite * jabber_caps_suite(void);
-Suite * jabber_digest_md5_suite(void);
-Suite * jabber_jutil_suite(void);
-Suite * jabber_scram_suite(void);
-Suite * oscar_util_suite(void);
-Suite * yahoo_util_suite(void);
-Suite * util_suite(void);
-Suite * purple_xmlnode_suite(void);
-Suite * purple_trie_suite(void);
-
-/* helper macros */
-#define assert_int_equal(expected, actual) { \
-	fail_if(expected != actual, "Expected '%d' but got '%d'", expected, actual); \
-}
-
-#define assert_string_equal(expected, actual) { \
-	const gchar *a = actual; \
-	fail_unless(strcmp(expected, a) == 0, "Expected '%s' but got '%s'", expected, a); \
-}
-
-#define assert_string_equal_free(expected, actual) { \
-	gchar *b = actual; \
-	assert_string_equal(expected, b); \
-	g_free(b); \
-}
-
-
-#endif /* ifndef TESTS_H */
-

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits