From e51d11856de9efb2856a667c5d423312e0041897 Mon Sep 17 00:00:00 2001 From: skarg Date: Tue, 30 Oct 2007 14:08:59 +0000 Subject: [PATCH] Updating unit tests. --- bacnet-stack/src/iam.c | 2 +- bacnet-stack/test.mak | 21 ++++++++++++++++++ bacnet-stack/test/datetime.mak | 16 +++++++------- bacnet-stack/test/filename.mak | 16 +++++++------- bacnet-stack/test/iam.mak | 28 ++++++++++++------------ bacnet-stack/test/ihave.mak | 24 ++++++++++----------- bacnet-stack/test/indtext.mak | 15 +++++++------ bacnet-stack/test/key.mak | 31 +++++++++++++++++++++++++++ bacnet-stack/test/keylist.mak | 39 ++++++++++++++-------------------- bacnet-stack/unittest.sh | 16 +++++++++++--- 10 files changed, 133 insertions(+), 75 deletions(-) create mode 100644 bacnet-stack/test.mak create mode 100644 bacnet-stack/test/key.mak diff --git a/bacnet-stack/src/iam.c b/bacnet-stack/src/iam.c index f7e3458d..2c5519f1 100755 --- a/bacnet-stack/src/iam.c +++ b/bacnet-stack/src/iam.c @@ -163,7 +163,7 @@ int iam_send(uint8_t * buffer) int bytes_sent = 0; BACNET_NPDU_DATA npdu_data; - /* if we are forbidden to send, don't send! */ + /* are we are forbidden to send? */ if (!dcc_communication_enabled()) return 0; /* encode the data */ diff --git a/bacnet-stack/test.mak b/bacnet-stack/test.mak new file mode 100644 index 00000000..a69681f2 --- /dev/null +++ b/bacnet-stack/test.mak @@ -0,0 +1,21 @@ +LOGFILE = test.log + +all: abort datetime + +clean: + rm ${LOGFILE} + +logfile: + touch ${LOGFILE} + +abort: test/abort.mak logfile + ( cd test ; make -f abort.mak clean ) + ( cd test ; make -f abort.mak ) + ( ./test/abort >> ${LOGFILE} ) + ( cd test ; make -f abort.mak clean ) + +datetime: test/datetime.mak logfile + ( cd test ; make -f datetime.mak clean ) + ( cd test ; make -f datetime.mak ) + ( ./test/datetime >> ${LOGFILE} ) + ( cd test ; make -f datetime.mak clean ) diff --git a/bacnet-stack/test/datetime.mak b/bacnet-stack/test/datetime.mak index 864a9de9..6564c654 100644 --- a/bacnet-stack/test/datetime.mak +++ b/bacnet-stack/test/datetime.mak @@ -1,13 +1,13 @@ #Makefile to build test case -CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -#CFLAGS = -Wall -I. -g -CFLAGS = -Wall -I. -Itest -DTEST -DTEST_DATE_TIME -g +CC = gcc +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DATE_TIME -SRCS = datetime.c \ - test/ctest.c +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g + +SRCS = $(SRC_DIR)/datetime.c \ + ctest.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/test/filename.mak b/bacnet-stack/test/filename.mak index 064b4df9..c798ae4d 100644 --- a/bacnet-stack/test/filename.mak +++ b/bacnet-stack/test/filename.mak @@ -1,13 +1,13 @@ #Makefile to build filename tests -CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -#CFLAGS = -Wall -I. -g -CFLAGS = -Wall -I. -Itest -DTEST -DTEST_FILENAME -g +CC = gcc +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_FILENAME -SRCS = filename.c \ - test/ctest.c +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g + +SRCS = $(SRC_DIR)/filename.c \ + ctest.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/test/iam.mak b/bacnet-stack/test/iam.mak index 1e91c8a0..93689d4c 100755 --- a/bacnet-stack/test/iam.mak +++ b/bacnet-stack/test/iam.mak @@ -1,20 +1,20 @@ #Makefile to build test case -CC = gcc -BASEDIR = . -# -g for debugging with gdb -DEFINES = -DBACFILE=1 -DTEST -DBIG_ENDIAN=0 -DTEST_IAM -DBACDL_TEST -INCLUDES = -I. -Idemo/object -Itest +CC = gcc +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_IAM -DBACDL_TEST + CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g -SRCS = bacdcode.c \ - bacint.c \ - bacstr.c \ - bigend.c \ - npdu.c \ - apdu.c \ - dcc.c \ - iam.c \ - test/ctest.c +SRCS = $(SRC_DIR)/bacdcode.c \ + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/npdu.c \ + $(SRC_DIR)/apdu.c \ + $(SRC_DIR)/dcc.c \ + $(SRC_DIR)/iam.c \ + ctest.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/test/ihave.mak b/bacnet-stack/test/ihave.mak index 1441ccf5..d379683e 100644 --- a/bacnet-stack/test/ihave.mak +++ b/bacnet-stack/test/ihave.mak @@ -1,17 +1,17 @@ #Makefile to build test case -CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -#CFLAGS = -Wall -I. -g -CFLAGS = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_I_HAVE -g +CC = gcc +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_I_HAVE -SRCS = bacdcode.c \ - bacint.c \ - bacstr.c \ - bigend.c \ - ihave.c \ - test/ctest.c +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g + +SRCS = $(SRC_DIR)/bacdcode.c \ + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/ihave.c \ + ctest.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/test/indtext.mak b/bacnet-stack/test/indtext.mak index 5ef4d586..1be54506 100644 --- a/bacnet-stack/test/indtext.mak +++ b/bacnet-stack/test/indtext.mak @@ -1,15 +1,18 @@ #Makefile to build unit tests -CC = gcc -BASEDIR = . -CFLAGS = -Wall -I. -Itest -g -DTEST -DTEST_INDEX_TEXT +CC = gcc +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_INDEX_TEXT -TARGET = indtext +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g -SRCS = indtext.c \ - test/ctest.c +SRCS = $(SRC_DIR)/indtext.c \ + ctest.c OBJS = ${SRCS:.c=.o} +TARGET = indtext + all: ${TARGET} ${TARGET}: ${OBJS} diff --git a/bacnet-stack/test/key.mak b/bacnet-stack/test/key.mak new file mode 100644 index 00000000..d569a589 --- /dev/null +++ b/bacnet-stack/test/key.mak @@ -0,0 +1,31 @@ +#Makefile to build unit tests +CC = gcc +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_KEY + +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g + +SRCS = $(SRC_DIR)/key.c \ + ctest.c + +TARGET = key + +OBJS = ${SRCS:.c=.o} + +all: ${TARGET} + +${TARGET}: ${OBJS} + ${CC} -o $@ ${OBJS} + +.c.o: + ${CC} -c ${CFLAGS} $*.c -o $@ + +depend: + rm -f .depend + ${CC} -MM ${CFLAGS} *.c >> .depend + +clean: + rm -rf core ${TARGET} $(OBJS) + +include: .depend diff --git a/bacnet-stack/test/keylist.mak b/bacnet-stack/test/keylist.mak index e6c1abd2..a7fa7eb7 100644 --- a/bacnet-stack/test/keylist.mak +++ b/bacnet-stack/test/keylist.mak @@ -1,38 +1,31 @@ #Makefile to build unit tests -CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -CFLAGS = -Wall -I. -Itest -g -DTEST -DTEST_KEY -DTEST_KEYLIST +CC = gcc +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_KEYLIST -KEY_SRCS = key.c \ - test/ctest.c +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g -KEYLIST_SRCS = keylist.c \ - test/ctest.c +SRCS = $(SRC_DIR)/keylist.c \ + ctest.c -OBJS = ${SRCS:.c=.o} +TARGET = keylist -KEY_OBJS = ${KEY_SRCS:.c=.o} +OBJS = ${SRCS:.c=.o} -KEYLIST_OBJS = ${KEYLIST_SRCS:.c=.o} +all: ${TARGET} -all: key keylist - -key: ${KEY_OBJS} - ${CC} -o $@ ${KEY_OBJS} - -keylist: ${KEYLIST_OBJS} - ${CC} -o $@ ${KEYLIST_OBJS} +${TARGET}: ${OBJS} + ${CC} -o $@ ${OBJS} .c.o: - ${CC} -c ${CFLAGS} $*.c - + ${CC} -c ${CFLAGS} $*.c -o $@ + depend: rm -f .depend ${CC} -MM ${CFLAGS} *.c >> .depend - + clean: - rm -rf core ${TARGET} $(OBJS) *.bak *.1 + rm -rf core ${TARGET} $(OBJS) include: .depend diff --git a/bacnet-stack/unittest.sh b/bacnet-stack/unittest.sh index d7b205ef..df8673fd 100755 --- a/bacnet-stack/unittest.sh +++ b/bacnet-stack/unittest.sh @@ -4,10 +4,10 @@ rm test.log touch test.log -make -f abort.mak clean -make -f abort.mak +make -f test/abort.mak clean +make -f test/abort.mak ./abort >> test.log -make -f abort.mak clean +make -f test/abort.mak clean make -f address.mak clean make -f address.mak @@ -116,6 +116,16 @@ make -f indtext.mak ./indtext >> test.log make -f indtext.mak clean +make -f test/key.mak clean +make -f test/key.mak +./key >> test.log +make -f test/key.mak clean + +make -f test/keylist.mak clean +make -f test/keylist.mak +./keylist >> test.log +make -f test/keylist.mak clean + make -f demo/object/lc.mak clean make -f demo/object/lc.mak ./loadcontrol >> test.log