diff options
| author | Aron Xu <aron@debian.org> | 2013-06-09 00:17:44 +0800 |
|---|---|---|
| committer | Aron Xu <aron@debian.org> | 2013-06-09 00:17:44 +0800 |
| commit | 2c8fe012ef1ff6e0613480dd182dec099aa9636e (patch) | |
| tree | f220f4e6733d3204aef57831a8dee2dd8551ed40 /win32 | |
| parent | 3c845c4be476dc0ecb93388de9cfedb3f611e6a8 (diff) | |
| download | libxml2-2c8fe012ef1ff6e0613480dd182dec099aa9636e.tar.gz | |
Imported Upstream version 2.9.1upstream/2.9.1
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.msvc | 15 | ||||
| -rw-r--r-- | win32/configure.js | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index d917541..2b3d544 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -43,7 +43,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" # The compiler and its options. CC = cl.exe -CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME) +CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) !if "$(WITH_THREADS)" != "no" CFLAGS = $(CFLAGS) /D "_REENTRANT" @@ -263,7 +263,8 @@ UTILS = $(BINDIR)\xmllint.exe\ $(BINDIR)\runtest.exe\ $(BINDIR)\runsuite.exe\ $(BINDIR)\testapi.exe\ - $(BINDIR)\testlimits.exe + $(BINDIR)\testlimits.exe\ + $(BINDIR)\testrecurse.exe !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native" UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe @@ -416,7 +417,15 @@ $(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxml libxmla libxmladll # TESTS -tests : XPathtests +tests : checktests XPathtests + +checktests : $(UTILS) + cd .. && win32\$(BINDIR)\runtest.exe + cd .. && win32\$(BINDIR)\testrecurse.exe + cd .. && win32\$(BINDIR)\testapi.exe + cd .. && win32\$(BINDIR)\testchar.exe + cd .. && win32\$(BINDIR)\testdict.exe + cd .. && win32\$(BINDIR)\runxmlconf.exe XPathtests : $(BINDIR)\testXPath.exe @echo. 2> .memdump diff --git a/win32/configure.js b/win32/configure.js index 11d2898..edd943a 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -305,6 +305,8 @@ function configureLibxml() of.WriteLine(s.replace(/\@WITH_TRIO\@/, withTrio? "1" : "0")); } else if (s.search(/\@WITH_THREADS\@/) != -1) { of.WriteLine(s.replace(/\@WITH_THREADS\@/, withThreads == "no"? "0" : "1")); + } else if (s.search(/\@WITH_THREAD_ALLOC\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_THREAD_ALLOC\@/, "0")); } else if (s.search(/\@WITH_FTP\@/) != -1) { of.WriteLine(s.replace(/\@WITH_FTP\@/, withFtp? "1" : "0")); } else if (s.search(/\@WITH_HTTP\@/) != -1) { |