Commit 9ea6231e authored by Daniel Veillard's avatar Daniel Veillard
Browse files

patch from Mark Vakoc for regression tests on Windows. the NaN problem

* win32/Makefile.msvc: patch from Mark Vakoc for regression tests
  on Windows.
* xpath.c: the NaN problem also shows up on Borland
Daniel
parent 0e00b28d
Thu Apr 29 17:05:00 CEST 2004 Daniel Veillard <daniel@veillard.com>
* win32/Makefile.msvc: patch from Mark Vakoc for regression tests
on Windows.
* xpath.c: the NaN problem also shows up on Borland
Mon Apr 26 23:37:12 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
* xmlregexp.c: enhanced xmlFARegExec range evaluation for min
......
......@@ -256,7 +256,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if the C compiler supports function prototypes. */
/* Define if compiler has function prototypes */
#undef PROTOTYPES
/* Determine what socket length (socklen_t) data type is */
......@@ -274,9 +274,6 @@
/* Using the Win32 Socket implementation */
#undef _WINSOCKAPI_
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
/* Win32 Std C name mangling work-around */
#undef snprintf
......
This diff is collapsed.
......@@ -297,7 +297,48 @@ $(UTILS_INTDIR) :
# Builds xmllint and friends. Uses the implicit rule for commands.
$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxml libxmla
# Source dependences should be autogenerated somehow here, but how to
# do it? I have no clue.
# TESTS
tests : XPathtests
XPathtests:
@echo. 2> .memdump
@echo ## XPath regression tests
@-$(BINDIR)\testXPath.exe | find /C "support not compiled in" 1>nul
@if %ERRORLEVEL% NEQ 0 @( \
echo Skipping debug not compiled in\
@exit 0 \
)
@for %%I in ($(XML_SRCDIR)\test\XPath\expr\*.*) do @( \
@IF NOT EXIST $(XML_SRCDIR)\result\XPath\expr\%%~nI ( \
@echo New test %%~nI &&\
@echo %%~nI &&\
$(BINDIR)\testXPath.exe -f --expr %%I > $(XML_SRCDIR)/result/XPath/expr/%%~nI &&\
findstr /C:"MEMORY ALLOCATED : 0" \
) ELSE ( \
$(BINDIR)\testXPath.exe -f --expr %%I 2>&1 > result.%%~nI &&\
fc $(XML_SRCDIR)\result\XPath\expr\%%~nI result.%%~nI >nul &\
iF ERRORLEVEL 1 exit 1 & \
findstr "MEMORY ALLOCATED" .memdump | findstr /C:"MEMORY ALLOCATED : 0" >nul &&\
del result.%%~nI \
) \
)
@for %%I in ($(XML_SRCDIR)\test\XPath\docs\*.*) do @( \
for %%J in ($(XML_SRCDIR)\test\XPath\tests\%%~nI*.*) do @( \
if not exist $(XML_SRCDIR)\result\XPath\tests\%%~nJ ( \
$(BINDIR)\testXPath.exe -f -i %%I %%J > $(XML_SRCDIR)\result\XPath\tests\%%~nJ &&\
findstr /C:"MEMORY ALLOCATED" .memdump | findstr /C:"MEMORY ALLOCATED : 0" > nul \
) ELSE ( \
$(BINDIR)\testXPAth.exe -f -i %%I %%J 2>&1 > result.%%~nJ &&\
findstr /C:"MEMORY ALLOCATED" .memdump | findstr /C:"MEMORY ALLOCATED : 0">null &&\
fc $(XML_SRCDIR)\result\XPath\tests\%%~nJ result.%%~nJ >null & \
IF ERRORLEVEL 1 (echo Error: %%I %%J & exit 1) & \
del result.%%~nJ \
)\
)\
)
......@@ -10922,7 +10922,7 @@ xmlXPathEvaluatePredicateResult(xmlXPathParserContextPtr ctxt,
case XPATH_BOOLEAN:
return(res->boolval);
case XPATH_NUMBER:
#if defined(_MSC_VER) && (_MSC_VER == 1200)
#if defined(__BORLANDC__) || (defined(_MSC_VER) && (_MSC_VER == 1200))
return((res->floatval == ctxt->context->proximityPosition) &&
(!xmlXPathIsNaN(res->floatval))); /* MSC pbm Mark Vakoc !*/
#else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment