luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 23:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtool installs/uninstalls the import library, no need to do it

Browse Source 
2005-06-26  Tor Lillqvist  <tml@novell.com>

	* glib/Makefile.am: libtool installs/uninstalls the import
	library, no need to do it ourselves. Do still install/uninstall
	the .def file, though.

	* glib/gmappedfile.c: Add Win32 implementation.
	(g_mapped_file_free): Don't mention writable shared mappings in
	the doc comment. Free the GMappedFile struct.

	* tests/mapping-test.c (main): No kill() or SIGUSR1 on Win32, use
	a flag file instead to stop the child. Use g_usleep() instead of
	sleep().
This commit is contained in:
Tor Lillqvist
2005-06-26 18:04:08 +00:00
committed by Tor Lillqvist
parent d8926119d1
commit ef48ce636b
7 changed files with 125 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/mapping-test.c
View File

@@ -24,22 +24,31 @@
#include <signal.h>
#include "glib.h"
#include "gstdio.h"
static gchar *dir, *filename, *displayname, *childname;
static gboolean stop = FALSE;
#ifndef G_OS_WIN32
static void
handle_usr1 (int signum)
{
stop = TRUE;
}
#endif
static gboolean
check_stop (gpointer data)
{
GMainLoop *loop = data;
#ifdef G_OS_WIN32
stop = g_file_test ("STOP", G_FILE_TEST_EXISTS);
#endif
if (stop)
g_main_loop_quit (loop);
@@ -93,7 +102,9 @@ child_main (int argc, char *argv[])
loop = g_main_loop_new (NULL, FALSE);
#ifndef G_OS_WIN32
signal (SIGUSR1, handle_usr1);
#endif
g_idle_add (check_stop, loop);
g_main_loop_run (loop);
@@ -160,6 +171,11 @@ test_child_private (gchar *argv0)
gchar *child_argv[3];
GPid child_pid;
#ifdef G_OS_WIN32
g_remove ("STOP");
g_assert (!g_file_test ("STOP", G_FILE_TEST_EXISTS));
#endif
write_or_die (filename, "ABC", -1);
map = map_or_die (filename, TRUE);
@@ -175,7 +191,7 @@ test_child_private (gchar *argv0)
}
/* give the child some time to set up its mapping */
sleep (2);
g_usleep (2000000);
buffer = (gchar *)g_mapped_file_get_contents (map);
buffer[0] = '1';
@@ -183,10 +199,14 @@ test_child_private (gchar *argv0)
buffer[2] = '3';
g_mapped_file_free (map);
#ifndef G_OS_WIN32
kill (child_pid, SIGUSR1);
#else
g_file_set_contents ("STOP", "Hey there\n", -1, NULL);
#endif
/* give the child some time to write the file */
sleep (2);
g_usleep (2000000);
if (!g_file_get_contents (childname, &buffer, &len, &error))
{