From b546df99ea3207d44ae2ccbefbc4c8f9ec2b9006 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Fri, 6 Jan 2006 12:05:28 +0000 Subject: [PATCH] added a bunch of tests use g_snprintf() don't include unistd.h twice. 2006-01-06 Hans Breuer * tests/makefile.msc : added a bunch of tests * tests/testcellrenderertext.c : use g_snprintf() * tests/testfilechooserbutton.c : don't include unistd.h twice. Removed the unconditional one and added direct.h for G_OS_WIN32 --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ tests/makefile.msc | 23 ++++++++++++++++------- tests/testcellrenderertext.c | 2 +- tests/testfilechooserbutton.c | 5 ++++- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67e08be969..b4138238e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-06 Hans Breuer + + * tests/makefile.msc : added a bunch of tests + * tests/testcellrenderertext.c : use g_snprintf() + * tests/testfilechooserbutton.c : don't include unistd.h twice. + Removed the unconditional one and added direct.h for G_OS_WIN32 + 2006-01-05 Hans Breuer * gdk/makefile.msc : also recurse into win32 for ::clean diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 67e08be969..b4138238e2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-01-06 Hans Breuer + + * tests/makefile.msc : added a bunch of tests + * tests/testcellrenderertext.c : use g_snprintf() + * tests/testfilechooserbutton.c : don't include unistd.h twice. + Removed the unconditional one and added direct.h for G_OS_WIN32 + 2006-01-05 Hans Breuer * gdk/makefile.msc : also recurse into win32 for ::clean diff --git a/tests/makefile.msc b/tests/makefile.msc index 778db5e3c8..335a4b58b3 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -40,14 +40,15 @@ all : \ # Test programs: # TESTAPPS = \ - testabi testactions \ - testcairo testcalendar testcombo testcombochange \ + autotestfilechooser floatingtest \ + testaccel testactions \ + testcairo testcalendar testcellrenderertext testcombo testcombochange \ testdnd \ - testentrycompletion \ - testfilechooser \ + testellipsise testentrycompletion \ + testfilechooser testfilechooserbutton \ testgtk \ - testicontheme testiconview testinput \ - testmenus testmerge testmultidisplay testmultiscreen \ + testicontheme testiconview testimage testinput \ + testmenus testmenubars testmerge testmultidisplay testmultiscreen \ testrgb \ testselection testspinbutton \ testtext testtextbuffer testtoolbar \ @@ -62,7 +63,7 @@ TESTAPPS = \ all-test-apps: - for %d in ($(TESTAPPS)) do nmake -nologo -f makefile.msc one-test-app THIS=%d + @for %d in ($(TESTAPPS)) do @nmake -nologo -f makefile.msc one-test-app THIS=%d one-test-app: @nmake -nologo -f makefile.msc $(THIS).exe TESTAPP=$(THIS) EXTRA_$(THIS)=1 @@ -73,6 +74,14 @@ one-test-app: EXTRA_LIBS = $(CAIRO_LIBS) !ENDIF +!IFDEF EXTRA_testentrycompletion +EXTRA_OBJETCS = prop-editor.obj +!ENDIF + +!IFDEF EXTRA_testfilechooserbutton +EXTRA_OBJETCS = prop-editor.obj +!ENDIF + !IFDEF EXTRA_testgtk EXTRA_LIBS = $(CAIRO_LIBS) EXTRA_OBJETCS = prop-editor.obj diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c index a33f124eb7..f5e0b94ce9 100644 --- a/tests/testcellrenderertext.c +++ b/tests/testcellrenderertext.c @@ -130,7 +130,7 @@ create_list_store (void) p = cell_params + i; - snprintf (buf, sizeof (buf), "%d", i); + g_snprintf (buf, sizeof (buf), "%d", i); gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c index 00215302dc..11d7fea78c 100644 --- a/tests/testfilechooserbutton.c +++ b/tests/testfilechooserbutton.c @@ -28,12 +28,15 @@ #include #include -#include #include #include +#ifdef G_OS_WIN32 +#include /* for _getcwd() */ +#endif + #include "prop-editor.h" static gchar *backend = "gtk+";