diff options
| author | Kasimier T. Buchcik <kbuchcik@src.gnome.org> | 2005-07-05 10:40:52 +0000 |
|---|---|---|
| committer | Kasimier T. Buchcik <kbuchcik@src.gnome.org> | 2005-07-05 10:40:52 +0000 |
| commit | 87db1cf6d1f05b286cf47960324b8536db442f80 (patch) | |
| tree | ce66acef090df5be66f594c6bdf253c7ede27ef3 | |
| parent | 91fe3edcaa7140947075f476a0f20b47a61cbb8b (diff) | |
| download | libxml2-87db1cf6d1f05b286cf47960324b8536db442f80.tar.gz | |
Tiny portability adjustment for win. Added runtest.exe and runsuite.exe to
* runsuite.c runtest.c: Tiny portability adjustment for win.
* win32/Makefile.*: Added runtest.exe and runsuite.exe to
be created.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | runsuite.c | 7 | ||||
| -rw-r--r-- | runtest.c | 8 | ||||
| -rw-r--r-- | win32/Makefile.bcb | 4 | ||||
| -rw-r--r-- | win32/Makefile.mingw | 4 | ||||
| -rw-r--r-- | win32/Makefile.msvc | 4 |
6 files changed, 26 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Tue Jul 5 12:38:36 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * runsuite.c runtest.c: Tiny portability adjustment for win. + * win32/Makefile.*: Added runtest.exe and runsuite.exe to + be created. + Mon Jul 4 17:44:26 CEST 2005 Daniel Veillard <daniel@veillard.com> * runsuite.c: first stb at unimplemnted detection @@ -31,7 +31,12 @@ #define LOGFILE "runsuite.log" FILE *logfile = NULL; -int verbose = 0; +int verbose = 0;
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#define vsnprintf _vsnprintf
+#define snprintf _snprintf
+#endif /************************************************************************ * * @@ -110,7 +110,7 @@ static int glob(const char *pattern, int flags, WIN32_FIND_DATA FindFileData; HANDLE hFind; unsigned int nb_paths = 0; - char directory[500], *tmp; + char directory[500]; int len; if ((pattern == NULL) || (pglob == NULL)) return(-1); @@ -669,11 +669,13 @@ static int loadMem(const char *filename, const char **mem, int *size) { while ((res = read(fd, &base[siz], info.st_size - siz)) > 0) { siz += res; } - close(fd); + close(fd);
+#if !defined(_WIN32) if (siz != info.st_size) { free(base); return(-1); - } + }
+#endif base[siz] = 0; *mem = base; *size = siz; diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 182e41f7..6603d2a4 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -214,7 +214,9 @@ UTILS = $(BINDIR)\xmllint.exe\ $(BINDIR)\testSAX.exe\ $(BINDIR)\testSchemas.exe\ $(BINDIR)\testURI.exe\ - $(BINDIR)\testXPath.exe + $(BINDIR)\testXPath.exe\ + $(BINDIR)\runtest.exe\
+ $(BINDIR)\runsuite.exe !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native" diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index 0a4f3148..61d15ab3 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -208,7 +208,9 @@ UTILS = $(BINDIR)/xmllint.exe\ $(BINDIR)/testSAX.exe\ $(BINDIR)/testSchemas.exe\ $(BINDIR)/testURI.exe\ - $(BINDIR)/testXPath.exe + $(BINDIR)/testXPath.exe\ + $(BINDIR)/runtest.exe\
+ $(BINDIR)/runsuite.exe ifeq ($(WITH_THREADS),yes) UTILS += $(BINDIR)/testThreadsWin32.exe endif diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index f57b53c8..f5914dbe 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -193,7 +193,9 @@ UTILS = $(BINDIR)\xmllint.exe\ $(BINDIR)\testSAX.exe\ $(BINDIR)\testSchemas.exe\ $(BINDIR)\testURI.exe\ - $(BINDIR)\testXPath.exe + $(BINDIR)\testXPath.exe\ + $(BINDIR)\runtest.exe\
+ $(BINDIR)\runsuite.exe !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native" UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe !else if "$(WITH_THREADS)" == "posix" |