Renamed gtestframework to gtestutils.

* glib/glib.h:
* glib/Makefile.am: added gtestutils.h to public includes.

* glib/gtestutils.c: include gtestutils.h.

* glib/gtestutils.h:
* glib/glib.symbols:
* glib/tests/testing.c: renamed gtestframework to gtestutils.

* glib/gtestframework.h: renamed to gtestutils.h.

* glib/gtestframework.c: renamed to gtestutils.c.

svn path=/trunk/; revision=5910
This commit is contained in:
Tim Janik 2007-11-20 15:01:02 +00:00
parent 0324be2048
commit 6332518cc2
6 changed files with 13 additions and 13 deletions

View File

@ -134,7 +134,7 @@ libglib_2_0_la_SOURCES = \
gstdio.c \ gstdio.c \
gstrfuncs.c \ gstrfuncs.c \
gstring.c \ gstring.c \
gtestframework.c \ gtestutils.c \
gthread.c \ gthread.c \
gthreadprivate.h \ gthreadprivate.h \
gthreadpool.c \ gthreadpool.c \
@ -215,7 +215,7 @@ glibsubinclude_HEADERS = \
gspawn.h \ gspawn.h \
gstdio.h \ gstdio.h \
gstrfuncs.h \ gstrfuncs.h \
gtestframework.h\ gtestutils.h \
gstring.h \ gstring.h \
gthread.h \ gthread.h \
gthreadpool.h \ gthreadpool.h \

View File

@ -70,7 +70,7 @@
#include <glib/gspawn.h> #include <glib/gspawn.h>
#include <glib/gstrfuncs.h> #include <glib/gstrfuncs.h>
#include <glib/gstring.h> #include <glib/gstring.h>
#include <glib/gtestframework.h> #include <glib/gtestutils.h>
#include <glib/gthread.h> #include <glib/gthread.h>
#include <glib/gthreadpool.h> #include <glib/gthreadpool.h>
#include <glib/gtimer.h> #include <glib/gtimer.h>

View File

@ -1240,8 +1240,8 @@ g_thread_pool_set_sort_function
#endif #endif
#endif #endif
#if IN_HEADER(__G_TESTFRAMEWORK_H__) #if IN_HEADER(__G_TEST_UTILS_H__)
#if IN_FILE(__G_TESTFRAMEWORK_C__) #if IN_FILE(__G_TEST_UTILS_C__)
g_assertion_message g_assertion_message
g_assertion_message_cmpnum g_assertion_message_cmpnum
g_assertion_message_cmpstr g_assertion_message_cmpstr

View File

@ -1,4 +1,4 @@
/* GLib testing framework examples /* GLib testing utilities
* Copyright (C) 2007 Tim Janik * Copyright (C) 2007 Tim Janik
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include "gtestframework.h" #include "gtestutils.h"
#include "galias.h" #include "galias.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -1700,5 +1700,5 @@ g_test_log_msg_free (GTestLogMsg *tmsg)
**/ **/
/* --- macros docs END --- */ /* --- macros docs END --- */
#define __G_TESTFRAMEWORK_C__ #define __G_TEST_UTILS_C__
#include "galiasdef.c" #include "galiasdef.c"

View File

@ -1,4 +1,4 @@
/* GLib testing framework examples /* GLib testing utilities
* Copyright (C) 2007 Tim Janik * Copyright (C) 2007 Tim Janik
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -16,8 +16,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __G_TESTFRAMEWORK_H__ #ifndef __G_TEST_UTILS_H__
#define __G_TESTFRAMEWORK_H__ #define __G_TEST_UTILS_H__
#include <glib.h> #include <glib.h>
@ -224,4 +224,4 @@ void g_test_log_msg_free (GTestLogMsg *tmsg);
G_END_DECLS; G_END_DECLS;
#endif /* __G_TESTFRAMEWORK_H__ */ #endif /* __G_TEST_UTILS_H__ */

View File

@ -18,7 +18,7 @@
* otherwise) arising in any way out of the use of this software, even * otherwise) arising in any way out of the use of this software, even
* if advised of the possibility of such damage. * if advised of the possibility of such damage.
*/ */
#include <glib/gtestframework.h> #include <glib/gtestutils.h>
#include <stdlib.h> #include <stdlib.h>
/* test assertion variants */ /* test assertion variants */