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

diff --git a/ChangeLog b/ChangeLog
index 67e08be969777b805c21a499090b44a37c06cc12..b4138238e2ed47719d3bcd103cc75d1bf85736ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 67e08be969777b805c21a499090b44a37c06cc12..b4138238e2ed47719d3bcd103cc75d1bf85736ca 100644 (file)
--- 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 778db5e3c8c435477d47a9d10379914874a662f4..335a4b58b305f4b7006a081f1bdcb9e49c734052 100644 (file)
--- 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 a33f124eb73b50ea10f50e6f9e0b58edeeeff254..f5e0b94ce9596747285061af7fd366067f32d91f 100644 (file)
--- 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 00215302dc0a26dfdd1809d1cbc40bc824b77a54..11d7fea78c6c7fef9c4d07b4e29a166e9187c078 100644 (file)
--- 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+";