diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2012-09-07 10:51:50 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2012-09-07 10:51:50 +0200 |
| commit | 056883923550ab5455d0a4d106b3af5002689b2f (patch) | |
| tree | 358e628b7f9c4b31962e36b5b510ca900e33d801 /tests | |
| parent | f6939dfbdd979dfbb749c64703d0cdc53dae106d (diff) | |
| download | crawler-056883923550ab5455d0a4d106b3af5002689b2f.tar.gz crawler-056883923550ab5455d0a4d106b3af5002689b2f.tar.bz2 | |
fixed more windows tests
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fetcher/Makefile.W32 | 9 | ||||
| -rwxr-xr-x | tests/url/Makefile.W32 | 7 | ||||
| -rwxr-xr-x | tests/url/exec_test.cmd | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/tests/fetcher/Makefile.W32 b/tests/fetcher/Makefile.W32 index 0d308ee..d02324b 100755 --- a/tests/fetcher/Makefile.W32 +++ b/tests/fetcher/Makefile.W32 @@ -5,19 +5,22 @@ SUBDIRS = !INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk INCLUDE_CXXFLAGS = \ - /D_WIN32_WINNT=0x504 \ -# /DUSE_MODULELOADER + /D_WIN32_WINNT=0x504 /DSHARED \ + /DUSE_MODULELOADER INCLUDE_DIRS = \ /I. \ /I$(TOPDIR)\src \ + /I$(TOPDIR)\include\module \ + /I$(TOPDIR)\include\util \ + /I$(TOPDIR)\include\crawler \ /I$(TOPDIR)\src\modules\fetcher\winhttp \ /I$(TOPDIR)\src\modules\urlnormalizer\simpleurl INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawler.lib \ + $(TOPDIR)\src\libcrawler\crawler.lib \ $(TOPDIR)\src\modules\fetcher\winhttp\winhttpfetcher.lib \ WinHttp.lib \ $(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib diff --git a/tests/url/Makefile.W32 b/tests/url/Makefile.W32 index 806f3f2..ff48b7f 100755 --- a/tests/url/Makefile.W32 +++ b/tests/url/Makefile.W32 @@ -6,18 +6,21 @@ SUBDIRS = INCLUDE_CXXFLAGS = \ /D_WIN32_WINNT=0x504 \ - /DUSE_MODULELOADER + /DUSE_MODULELOADER /DSHARED INCLUDE_DIRS = \ /I. \ /I$(TOPDIR)\src \ + /I$(TOPDIR)\include\module \ + /I$(TOPDIR)\include\util \ + /I$(TOPDIR)\include\crawler \ /I$(TOPDIR)\src\modules\urlnormalizer\simpleurl \ /I$(TOPDIR)\src\modules\urlnormalizer\googleurl INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawler.lib \ + $(TOPDIR)\src\libcrawler\crawler.lib \ $(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib \ $(TOPDIR)\src\modules\urlnormalizer\googleurl\googleurlnormalizer.lib \ $(TOPDIR)\googleurl\googleurl.lib \ diff --git a/tests/url/exec_test.cmd b/tests/url/exec_test.cmd index 8f29552..2809f46 100755 --- a/tests/url/exec_test.cmd +++ b/tests/url/exec_test.cmd @@ -7,6 +7,8 @@ shift set TITLE=%1
shift
+copy ..\..\src\libcrawler\crawler.dll . >NULL
+copy ..\..\src\logger\logger.dll . >NULL
%BINARY% %1 %2 %3 %4 >%ID%.OUT 2>%ID%.ERR
type %ID%.ERR >> %ID%.OUT
..\..\utils\win32\dos2unix <%ID%.OUT >%ID%.RES
|