diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2012-09-05 18:51:26 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2012-09-05 18:51:26 +0200 |
| commit | df2c44401f8dd736a903e73813e5f83fb15b36b6 (patch) | |
| tree | b845f54b2dbb3f14dab435d2640c58b7b85e7975 /tests/modules | |
| parent | 43aaf39cc828f4e1cec12a944560571993fb24f7 (diff) | |
| download | crawler-df2c44401f8dd736a903e73813e5f83fb15b36b6.tar.gz crawler-df2c44401f8dd736a903e73813e5f83fb15b36b6.tar.bz2 | |
split away util, logger, and module
made a liblogger
adapted all tests
Diffstat (limited to 'tests/modules')
| -rwxr-xr-x | tests/modules/GNUmakefile | 11 | ||||
| -rwxr-xr-x | tests/modules/exec_test | 2 | ||||
| -rwxr-xr-x | tests/modules/testmod/GNUmakefile | 4 | ||||
| -rwxr-xr-x | tests/modules/testmod2/GNUmakefile | 4 | ||||
| -rwxr-xr-x | tests/modules/testmod3/GNUmakefile | 4 |
5 files changed, 18 insertions, 7 deletions
diff --git a/tests/modules/GNUmakefile b/tests/modules/GNUmakefile index 7a1ee57..ba0040b 100755 --- a/tests/modules/GNUmakefile +++ b/tests/modules/GNUmakefile @@ -3,11 +3,16 @@ TOPDIR = ../.. SUBDIRS = testmod testmod2 testmod3 INCLUDE_DIRS = \ - -I. -I$(TOPDIR)/src + -I. -I$(TOPDIR)/src \ + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/util -INCLUDE_LDFLAGS = +INCLUDE_LDFLAGS = \ + -L$(TOPDIR)/src/logger -INCLUDE_LIBS = +INCLUDE_LIBS = \ + $(TOPDIR)/src/libcrawler.a \ + -llogger TEST_CPP_BINS = \ test1$(EXE) \ diff --git a/tests/modules/exec_test b/tests/modules/exec_test index a2a6609..626d298 100755 --- a/tests/modules/exec_test +++ b/tests/modules/exec_test @@ -4,5 +4,5 @@ BINARY=$1 TITLE=$2 printf "$BINARY: $TITLE .. " -LD_LIBRARY_PATH=../../src ./$BINARY >$BINARY.RES 2>&1 +LD_LIBRARY_PATH=../../src:../../src/logger ./$BINARY >$BINARY.RES 2>&1 diff $BINARY.MUST $BINARY.RES > $BINARY.DIFF && printf "OK\n" || printf "ERROR\n" diff --git a/tests/modules/testmod/GNUmakefile b/tests/modules/testmod/GNUmakefile index 01dbfee..c8fbc8a 100755 --- a/tests/modules/testmod/GNUmakefile +++ b/tests/modules/testmod/GNUmakefile @@ -5,7 +5,9 @@ SUBDIRS = -include $(TOPDIR)/makefiles/gmake/platform.mk INCLUDE_DIRS = \ - -I. -I$(TOPDIR)/src -I.. + -I. -I$(TOPDIR)/src -I.. \ + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/util INCLUDE_CXXFLAGS = \ diff --git a/tests/modules/testmod2/GNUmakefile b/tests/modules/testmod2/GNUmakefile index 90f1f05..5e4630f 100755 --- a/tests/modules/testmod2/GNUmakefile +++ b/tests/modules/testmod2/GNUmakefile @@ -5,7 +5,9 @@ SUBDIRS = -include $(TOPDIR)/makefiles/gmake/platform.mk INCLUDE_DIRS = \ - -I. -I$(TOPDIR)/src -I.. + -I. -I$(TOPDIR)/src -I.. \ + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/util INCLUDE_CXXFLAGS = \ diff --git a/tests/modules/testmod3/GNUmakefile b/tests/modules/testmod3/GNUmakefile index 01ae8eb..643fd6a 100755 --- a/tests/modules/testmod3/GNUmakefile +++ b/tests/modules/testmod3/GNUmakefile @@ -5,7 +5,9 @@ SUBDIRS = -include $(TOPDIR)/makefiles/gmake/platform.mk INCLUDE_DIRS = \ - -I. -I$(TOPDIR)/src -I.. + -I. -I$(TOPDIR)/src -I.. \ + -I$(TOPDIR)/include/module \ + -I$(TOPDIR)/include/util INCLUDE_CXXFLAGS = \ |