diff --git a/ChangeLog b/ChangeLog index 2c1be844f..acd5c93df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2c1be844f..acd5c93df 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c1be844f..acd5c93df 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2c1be844f..acd5c93df 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2c1be844f..acd5c93df 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2c1be844f..acd5c93df 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2c1be844f..acd5c93df 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2c1be844f..acd5c93df 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Thu Jan 21 12:40:11 EST 1999 Jeff Garzik + + * gmodule/gmodule-dl.c (_g_module_build_path): + Add braces to eliminate an ambiguous else warning. + + * tests/{Makefile.am, string-test.c, strfunc-test.c}: + Separate string and strfunc tests, working towards goal of + having separate test for each of the GLib modules. + Add a couple GString length tests. + Thu Jan 21 09:36:05 EST 1999 Jeff Garzik * configure.in: diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c index e8c986fc7..6afc6d587 100644 --- a/gmodule/gmodule-dl.c +++ b/gmodule/gmodule-dl.c @@ -125,12 +125,12 @@ static gchar* _g_module_build_path (const gchar *directory, const gchar *module_name) { - if (directory && *directory) + if (directory && *directory) { if (strncmp (module_name, "lib", 3) == 0) return g_strconcat (directory, "/", module_name, NULL); else return g_strconcat (directory, "/lib", module_name, ".so", NULL); - else if (strncmp (module_name, "lib", 3) == 0) + } else if (strncmp (module_name, "lib", 3) == 0) return g_strdup (module_name); else return g_strconcat ("lib", module_name, ".so", NULL); diff --git a/tests/.cvsignore b/tests/.cvsignore index b56bcd02f..f6d398f4d 100644 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -32,3 +32,4 @@ array-test tree-test dirname-test type-test +strfunc-test diff --git a/tests/Makefile.am b/tests/Makefile.am index b93487b83..1734038ad 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,6 +10,7 @@ TESTS = \ relation-test \ slist-test \ string-test \ + strfunc-test \ tree-test \ type-test @@ -23,6 +24,7 @@ node_test_LDADD = $(top_builddir)/libglib.la relation_test_LDADD = $(top_builddir)/libglib.la slist_test_LDADD = $(top_builddir)/libglib.la string_test_LDADD = $(top_builddir)/libglib.la +strfunc_test_LDADD = $(top_builddir)/libglib.la tree_test_LDADD = $(top_builddir)/libglib.la type_test_LDADD = $(top_builddir)/libglib.la diff --git a/tests/strfunc-test.c b/tests/strfunc-test.c new file mode 100644 index 000000000..1445453fc --- /dev/null +++ b/tests/strfunc-test.c @@ -0,0 +1,96 @@ +/* GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#undef G_LOG_DOMAIN + +#include +#include +#include "glib.h" + +int array[10000]; +gboolean failed = FALSE; + +#define TEST(m,cond) G_STMT_START { failed = !(cond); \ +if (failed) \ + { if (!m) \ + g_print ("\n(%s:%d) failed for: %s\n", __FILE__, __LINE__, ( # cond )); \ + else \ + g_print ("\n(%s:%d) failed for: %s: (%s)\n", __FILE__, __LINE__, ( # cond ), (gchar*)m); \ + } \ +else \ + g_print ("."); fflush (stdout); \ +} G_STMT_END + +#define C2P(c) ((gpointer) ((long) (c))) +#define P2C(p) ((gchar) ((long) (p))) + +#define GLIB_TEST_STRING "el dorado " +#define GLIB_TEST_STRING_5 "el do" + +typedef struct { + guint age; + gchar name[40]; +} GlibTestInfo; + +int +main (int argc, + char *argv[]) +{ + gchar *string; + + g_assert (g_strcasecmp ("FroboZZ", "frobozz") == 0); + g_assert (g_strcasecmp ("frobozz", "frobozz") == 0); + g_assert (g_strcasecmp ("frobozz", "FROBOZZ") == 0); + g_assert (g_strcasecmp ("FROBOZZ", "froboz") != 0); + g_assert (g_strcasecmp ("", "") == 0); + g_assert (g_strcasecmp ("!#%&/()", "!#%&/()") == 0); + g_assert (g_strcasecmp ("a", "b") < 0); + g_assert (g_strcasecmp ("a", "B") < 0); + g_assert (g_strcasecmp ("A", "b") < 0); + g_assert (g_strcasecmp ("A", "B") < 0); + g_assert (g_strcasecmp ("b", "a") > 0); + g_assert (g_strcasecmp ("b", "A") > 0); + g_assert (g_strcasecmp ("B", "a") > 0); + g_assert (g_strcasecmp ("B", "A") > 0); + + g_assert(g_strdup(NULL) == NULL); + string = g_strdup(GLIB_TEST_STRING); + g_assert(string != NULL); + g_assert(strcmp(string, GLIB_TEST_STRING) == 0); + g_free(string); + + string = g_strconcat(GLIB_TEST_STRING, NULL); + g_assert(string != NULL); + g_assert(strcmp(string, GLIB_TEST_STRING) == 0); + g_free(string); + + string = g_strconcat(GLIB_TEST_STRING, GLIB_TEST_STRING, + GLIB_TEST_STRING, NULL); + g_assert(string != NULL); + g_assert(strcmp(string, GLIB_TEST_STRING GLIB_TEST_STRING + GLIB_TEST_STRING) == 0); + g_free(string); + + string = g_strdup_printf ("%05d %-5s", 21, "test"); + g_assert (string != NULL); + g_assert (strcmp(string, "00021 test ") == 0); + g_free (string); + + return 0; +} + diff --git a/tests/string-test.c b/tests/string-test.c index 99a7c4094..228e96417 100644 --- a/tests/string-test.c +++ b/tests/string-test.c @@ -52,7 +52,6 @@ main (int argc, char *argv[]) { GStringChunk *string_chunk; - gchar *string; gchar *tmp_string, *tmp_string_2; gint i; @@ -84,6 +83,9 @@ main (int argc, g_assert (string1 != NULL); g_assert (string2 != NULL); + g_assert (strlen (string1->str) == string1->len); + g_assert (strlen (string2->str) == string2->len); + g_assert (string2->len == 0); g_assert (strcmp ("hi pete!", string1->str) == 0); g_assert (strcmp ("", string2->str) == 0); @@ -111,44 +113,6 @@ main (int argc, 10, 666, 15, 15, 666.666666666, 666.666666666); #endif - g_assert (g_strcasecmp ("FroboZZ", "frobozz") == 0); - g_assert (g_strcasecmp ("frobozz", "frobozz") == 0); - g_assert (g_strcasecmp ("frobozz", "FROBOZZ") == 0); - g_assert (g_strcasecmp ("FROBOZZ", "froboz") != 0); - g_assert (g_strcasecmp ("", "") == 0); - g_assert (g_strcasecmp ("!#%&/()", "!#%&/()") == 0); - g_assert (g_strcasecmp ("a", "b") < 0); - g_assert (g_strcasecmp ("a", "B") < 0); - g_assert (g_strcasecmp ("A", "b") < 0); - g_assert (g_strcasecmp ("A", "B") < 0); - g_assert (g_strcasecmp ("b", "a") > 0); - g_assert (g_strcasecmp ("b", "A") > 0); - g_assert (g_strcasecmp ("B", "a") > 0); - g_assert (g_strcasecmp ("B", "A") > 0); - - g_assert(g_strdup(NULL) == NULL); - string = g_strdup(GLIB_TEST_STRING); - g_assert(string != NULL); - g_assert(strcmp(string, GLIB_TEST_STRING) == 0); - g_free(string); - - string = g_strconcat(GLIB_TEST_STRING, NULL); - g_assert(string != NULL); - g_assert(strcmp(string, GLIB_TEST_STRING) == 0); - g_free(string); - - string = g_strconcat(GLIB_TEST_STRING, GLIB_TEST_STRING, - GLIB_TEST_STRING, NULL); - g_assert(string != NULL); - g_assert(strcmp(string, GLIB_TEST_STRING GLIB_TEST_STRING - GLIB_TEST_STRING) == 0); - g_free(string); - - string = g_strdup_printf ("%05d %-5s", 21, "test"); - g_assert (string != NULL); - g_assert (strcmp(string, "00021 test ") == 0); - g_free (string); - return 0; }