From dcbeb3ab19da5393877b1ef4db2ac26d8a5787c0 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 7 Sep 2012 12:55:19 +0200 Subject: fixed all tests on Windows, still issues with static libcrawl --- tests/fetcher/Makefile.W32 | 4 ++-- tests/logger/exec_test.cmd | 2 +- tests/url/exec_test.cmd | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/fetcher/Makefile.W32 b/tests/fetcher/Makefile.W32 index d02324b..fb33e07 100755 --- a/tests/fetcher/Makefile.W32 +++ b/tests/fetcher/Makefile.W32 @@ -20,10 +20,10 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\libcrawler\crawler.lib \ $(TOPDIR)\src\modules\fetcher\winhttp\winhttpfetcher.lib \ WinHttp.lib \ - $(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib + $(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizerstatic.lib \ + $(TOPDIR)\src\libcrawler\crawlerstatic.lib TEST_CPP_BINS = \ test1.exe diff --git a/tests/logger/exec_test.cmd b/tests/logger/exec_test.cmd index 1203382..123b666 100755 --- a/tests/logger/exec_test.cmd +++ b/tests/logger/exec_test.cmd @@ -3,7 +3,7 @@ set BINARY=%1 set TITLE=%2 -copy ..\..\src\logger\logger.dll . +copy ..\..\src\logger\logger.dll . >NUL %BINARY% >%BINARY%.OUT 2>%BINARY%.ERR ..\..\utils\win32\dos2unix <%BINARY%.OUT >%BINARY%.RES ..\..\utils\win32\dos2unix <%BINARY%.ERR >%BINARY%.RES diff --git a/tests/url/exec_test.cmd b/tests/url/exec_test.cmd index 2809f46..e01c81e 100755 --- a/tests/url/exec_test.cmd +++ b/tests/url/exec_test.cmd @@ -7,8 +7,8 @@ shift set TITLE=%1 shift -copy ..\..\src\libcrawler\crawler.dll . >NULL -copy ..\..\src\logger\logger.dll . >NULL +copy ..\..\src\libcrawler\crawler.dll . >NUL +copy ..\..\src\logger\logger.dll . >NUL %BINARY% %1 %2 %3 %4 >%ID%.OUT 2>%ID%.ERR type %ID%.ERR >> %ID%.OUT ..\..\utils\win32\dos2unix <%ID%.OUT >%ID%.RES -- cgit v1.2.3-54-g00ecf