luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 14:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Find test case for srcdir != builddir, miscellaneous cleanups.

Browse Source 
Sun Aug 12 10:09:00 2001  Owen Taylor  <otaylor@redhat.com>

        * tests/iochannel-test.c (main): Find test case for
        srcdir != builddir, miscellaneous cleanups.

        * tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
        casemap.txt iochannel-test-infile.

        * glib-2.0-uninstalled.pc.in: Fix for move of glib files
        into subdir. (Pointed out by Steve Baker)
This commit is contained in:
Owen Taylor 2001-08-12 14:12:02 +00:00 committed by Owen Taylor
parent 9a9b43bca8
commit dff516edc8
11 changed files with 116 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

11
ChangeLog.pre-2-12
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
* tests/iochannel-test.c (main): Find test case for
srcdir != builddir, miscellaneous cleanups.
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
casemap.txt iochannel-test-infile.
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
into subdir. (Pointed out by Steve Baker)
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org> Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings

4
glib-2.0-uninstalled.pc.in
View File

@ -5,5 +5,5 @@ glib_mkenums=${pc_top_builddir}/${pcfiledir}/@srcdir@/gobject/glib-mkenums
Name: GLib Uninstalled Name: GLib Uninstalled
Description: C Utility Library, Not Installed Description: C Utility Library, Not Installed
Version: @VERSION@ Version: @VERSION@
Libs: ${pc_top_builddir}/${pcfiledir}/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@ Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/glib

17
tests/Makefile.am
View File

@ -13,14 +13,19 @@ libadd_libglib = $(libglib)
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
EXTRA_DIST = \ EXTRA_DIST = \
$(test_scripts) \ $(test_scripts) \
makefile.msc.in \ makefile.msc.in \
makefile.mingw.in \ makefile.mingw.in \
casefold.txt \
casemap.txt \
gen-casefold-txt.pl \
gen-casemap-txt.pl \
iochannel-test-infile \
utf8.txt utf8.txt
BUILT_EXTRA_DIST = \ BUILT_EXTRA_DIST = \
makefile.mingw \ makefile.mingw \
makefile.msc makefile.msc
if HAVE_CXX if HAVE_CXX

26
tests/iochannel-test.c
View File

@ -13,37 +13,41 @@ gint main (gint argc, gchar * argv[])
GIOChannel *gio_r, *gio_w ; GIOChannel *gio_r, *gio_w ;
GError *gerr = NULL; GError *gerr = NULL;
GString *buffer; GString *buffer;
char *filename;
char *srcdir = getenv ("srcdir");
gint rlength = 0, wlength = 0, length_out, line_term_len; gint rlength = 0, wlength = 0, length_out, line_term_len;
gboolean block; gboolean block;
const gchar encoding[] = "EUC-JP", line_term[] = "\n"; const gchar encoding[] = "EUC-JP", line_term[] = "\n";
GIOStatus status; GIOStatus status;
GIOFlags flags; GIOFlags flags;
if (!srcdir)
srcdir = ".";
filename = g_strconcat (srcdir, G_DIR_SEPARATOR_S, "iochannel-test-infile", NULL);
setbuf(stdout, NULL); /* For debugging */ setbuf(stdout, NULL); /* For debugging */
gio_r = g_io_channel_new_file ("iochannel-test-infile", "r", &gerr); gio_r = g_io_channel_new_file (filename, "r", &gerr);
if (gerr) if (gerr)
{ {
g_warning(gerr->message); g_warning("Unable to open file %s: %s", filename, gerr->message);
g_warning("Unable to open file %s", "iochannel-test-infile"); g_error_free(gerr);
g_free(gerr); return 1;
return 0;
} }
gio_w = g_io_channel_new_file( "iochannel-test-outfile", "w", &gerr); gio_w = g_io_channel_new_file( "iochannel-test-outfile", "w", &gerr);
if (gerr) if (gerr)
{ {
g_warning(gerr->message); g_warning("Unable to open file %s: %s", "iochannel-test-outfile", gerr->message);
g_warning("Unable to open file %s", "iochannel-test-outfile"); g_error_free(gerr);
g_free(gerr); return 1;
return 0;
} }
g_io_channel_set_encoding (gio_r, encoding, &gerr); g_io_channel_set_encoding (gio_r, encoding, &gerr);
if (gerr) if (gerr)
{ {
g_warning(gerr->message); g_warning(gerr->message);
g_free(gerr); g_error_free(gerr);
return 0; return 1;
} }
g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE); g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE);