diff options
author | Hans Breuer <hans@breuer.org> | 2006-01-06 12:05:28 +0000 |
---|---|---|
committer | Hans Breuer <hans@src.gnome.org> | 2006-01-06 12:05:28 +0000 |
commit | b546df99ea3207d44ae2ccbefbc4c8f9ec2b9006 (patch) | |
tree | 0888ca34824368a13227154cb1c6c0508f1370a3 | |
parent | a2c7b3f4baf03d656ab9cba2bc2b793299d375f3 (diff) | |
download | gdk-pixbuf-b546df99ea3207d44ae2ccbefbc4c8f9ec2b9006.tar.gz |
added a bunch of tests use g_snprintf() don't include unistd.h twice.
2006-01-06 Hans Breuer <hans@breuer.org>
* 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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
-rw-r--r-- | tests/makefile.msc | 23 | ||||
-rw-r--r-- | tests/testcellrenderertext.c | 2 | ||||
-rw-r--r-- | tests/testfilechooserbutton.c | 5 |
5 files changed, 35 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2006-01-06 Hans Breuer <hans@breuer.org> + + * 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 <hans@breuer.org> * gdk/makefile.msc : also recurse into win32 for ::clean diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 67e08be96..b4138238e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-01-06 Hans Breuer <hans@breuer.org> + + * 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 <hans@breuer.org> * gdk/makefile.msc : also recurse into win32 for ::clean diff --git a/tests/makefile.msc b/tests/makefile.msc index 778db5e3c..335a4b58b 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 a33f124eb..f5e0b94ce 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 00215302d..11d7fea78 100644 --- a/tests/testfilechooserbutton.c +++ b/tests/testfilechooserbutton.c @@ -28,12 +28,15 @@ #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> #include <string.h> #include <gtk/gtk.h> +#ifdef G_OS_WIN32 +#include <direct.h> /* for _getcwd() */ +#endif + #include "prop-editor.h" static gchar *backend = "gtk+"; |