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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 6ea366dcc9655446f35351e65f9b6c853c18bb5a..4f5822ad1989f477671cbd550a37cebf190b7cfa 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -134,7 +134,7 @@ libglib_2_0_la_SOURCES =    \
        gstdio.c                \
        gstrfuncs.c             \
        gstring.c               \
-       gtestframework.c        \
+       gtestutils.c            \
        gthread.c               \
        gthreadprivate.h        \
        gthreadpool.c           \
@@ -215,7 +215,7 @@ glibsubinclude_HEADERS =   \
        gspawn.h        \
        gstdio.h        \
        gstrfuncs.h     \
-       gtestframework.h\
+       gtestutils.h    \
        gstring.h       \
        gthread.h       \
        gthreadpool.h   \

diff --git a/glib/glib.h b/glib/glib.h
index dc2bb506dfdc75e06139af5a049b321496d29d8a..4a3023781cac5f1e72166fee1dcb4fb470b1e9d0 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -70,7 +70,7 @@
 #include <glib/gspawn.h>
 #include <glib/gstrfuncs.h>
 #include <glib/gstring.h>
-#include <glib/gtestframework.h>
+#include <glib/gtestutils.h>
 #include <glib/gthread.h>
 #include <glib/gthreadpool.h>
 #include <glib/gtimer.h>

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 6214096c8f2bf461d57af54cade82fc3f81b0271..9288e562dec038f404447491d595a9dd36411377 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1240,8 +1240,8 @@ g_thread_pool_set_sort_function
 #endif
 #endif
 
-#if IN_HEADER(__G_TESTFRAMEWORK_H__)
-#if IN_FILE(__G_TESTFRAMEWORK_C__)
+#if IN_HEADER(__G_TEST_UTILS_H__)
+#if IN_FILE(__G_TEST_UTILS_C__)
 g_assertion_message
 g_assertion_message_cmpnum
 g_assertion_message_cmpstr

diff --git a/glib/gtestframework.c b/glib/gtestutils.c
similarity index 99%
rename from glib/gtestframework.c
rename to glib/gtestutils.c
index 78acd3e185702d73b1d46608763710d9e069872e..494aa085ba1e09a8367981d9c9f514f54439bf88 100644 (file)
--- a/glib/gtestframework.c
+++ b/glib/gtestutils.c
@@ -1,4 +1,4 @@
-/* GLib testing framework examples
+/* GLib testing utilities
  * Copyright (C) 2007 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 #include "config.h"
-#include "gtestframework.h"
+#include "gtestutils.h"
 #include "galias.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1700,5 +1700,5 @@ g_test_log_msg_free (GTestLogMsg *tmsg)
  **/
 /* --- macros docs END --- */
 
-#define __G_TESTFRAMEWORK_C__
+#define __G_TEST_UTILS_C__
 #include "galiasdef.c"

diff --git a/glib/gtestframework.h b/glib/gtestutils.h
similarity index 98%
rename from glib/gtestframework.h
rename to glib/gtestutils.h
index 0cc162f110faeb4fe836fb3769f43fc85ad5dceb..b57dfd0afd0f29df2d0b63a5f29ce5196251b888 100644 (file)
--- a/glib/gtestframework.h
+++ b/glib/gtestutils.h
@@ -1,4 +1,4 @@
-/* GLib testing framework examples
+/* GLib testing utilities
  * Copyright (C) 2007 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
@@ -16,8 +16,8 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_TESTFRAMEWORK_H__
-#define __G_TESTFRAMEWORK_H__
+#ifndef __G_TEST_UTILS_H__
+#define __G_TEST_UTILS_H__
 
 #include <glib.h>
 
@@ -224,4 +224,4 @@ void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
 
 G_END_DECLS;
 
-#endif /* __G_TESTFRAMEWORK_H__ */
+#endif /* __G_TEST_UTILS_H__ */

diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index f1940d051413b8e7f76215320c39f225ca858007..468cd08e165b47d3901fa1644319e2c412e78f7d 100644 (file)
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -18,7 +18,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestframework.h>
+#include <glib/gtestutils.h>
 #include <stdlib.h>
 
 /* test assertion variants */