diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2012-09-07 12:55:19 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2012-09-07 12:55:19 +0200 |
| commit | dcbeb3ab19da5393877b1ef4db2ac26d8a5787c0 (patch) | |
| tree | 3cd7187cd034b05ec8652c6a97c8a320b75def39 /tests | |
| parent | 056883923550ab5455d0a4d106b3af5002689b2f (diff) | |
| download | crawler-dcbeb3ab19da5393877b1ef4db2ac26d8a5787c0.tar.gz crawler-dcbeb3ab19da5393877b1ef4db2ac26d8a5787c0.tar.bz2 | |
fixed all tests on Windows, still issues with static libcrawl
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fetcher/Makefile.W32 | 4 | ||||
| -rwxr-xr-x | tests/logger/exec_test.cmd | 2 | ||||
| -rwxr-xr-x | tests/url/exec_test.cmd | 4 |
3 files changed, 5 insertions, 5 deletions
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
|