Fixed the unit tests after integration of property-list property and device-object-property-reference properties. Thank you for noticing it was broken, Nikola Jelić, and for sending in fixes.

This commit is contained in:
skarg
2015-11-04 16:53:21 +00:00
parent b5e860dbe4
commit 8a48241e14
31 changed files with 96 additions and 88 deletions
+6 -5
View File
@@ -13,6 +13,7 @@ SRCS = $(SRC_DIR)/address.c \
$(SRC_DIR)/bacstr.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/datetime.c \
$(SRC_DIR)/lighting.c \
$(SRC_DIR)/bactext.c \
@@ -24,18 +25,18 @@ OBJS = ${SRCS:.c=.o}
TARGET = address
all: ${TARGET}
${TARGET}: ${OBJS}
${CC} -o $@ ${OBJS}
${CC} -o $@ ${OBJS}
.c.o:
${CC} -c ${CFLAGS} $*.c -o $@
depend:
rm -f .depend
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -rf ${TARGET} $(OBJS)
rm -rf ${TARGET} $(OBJS)
include: .depend
+1 -2
View File
@@ -4,8 +4,6 @@ CC = gcc
SRC_DIR = ../src
INCLUDES = -I../include -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACNET_APPLICATION_DATA
DEFINES += -DBACAPP_ALL -DPRINT_ENABLED=1
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
SRCS = $(SRC_DIR)/bacdcode.c \
@@ -13,6 +11,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/bacstr.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/datetime.c \
$(SRC_DIR)/bactext.c \
$(SRC_DIR)/lighting.c \
+6 -5
View File
@@ -1,7 +1,7 @@
#Makefile to build test case
CC = gcc
SRC_DIR = ../src
INCLUDES = -I../include -I. -I../demo/object
INCLUDES = -I../include -I. -I../demo/object
DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_COV -DBACAPP_ALL
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
@@ -12,6 +12,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/datetime.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/lighting.c \
$(SRC_DIR)/indtext.c \
$(SRC_DIR)/bactext.c \
@@ -23,17 +24,17 @@ OBJS = ${SRCS:.c=.o}
TARGET = cov
all: ${TARGET}
${TARGET}: ${OBJS}
${CC} -o $@ ${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) *.bak *.1 *.ini
+1
View File
@@ -12,6 +12,7 @@ SRCS = $(SRC_DIR)/datetime.c \
$(SRC_DIR)/bacstr.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/lighting.c \
$(SRC_DIR)/bactext.c \
$(SRC_DIR)/indtext.c \
+4 -4
View File
@@ -26,19 +26,19 @@ SRCS = $(SRC_DIR)/bacdcode.c \
TARGET = event
all: ${TARGET}
OBJS = ${SRCS:.c=.o}
${TARGET}: ${OBJS}
${CC} -o $@ ${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) *.bak *.1 *.ini
+5 -4
View File
@@ -11,6 +11,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/bacstr.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/datetime.c \
$(SRC_DIR)/lighting.c \
$(SRC_DIR)/bactext.c \
@@ -22,19 +23,19 @@ SRCS = $(SRC_DIR)/bacdcode.c \
TARGET = getevent
all: ${TARGET}
OBJS = ${SRCS:.c=.o}
${TARGET}: ${OBJS}
${CC} -o $@ ${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) *.bak *.1 *.ini
+5 -5
View File
@@ -12,10 +12,10 @@ SRCS = $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/bacerror.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/bactext.c \
$(SRC_DIR)/indtext.c \
$(SRC_DIR)/datetime.c \
$(SRC_DIR)/proplist.c \
$(SRC_DIR)/lighting.c \
$(SRC_DIR)/memcopy.c \
$(SRC_DIR)/lso.c \
@@ -24,19 +24,19 @@ SRCS = $(SRC_DIR)/bacdcode.c \
TARGET = lso
all: ${TARGET}
OBJS = ${SRCS:.c=.o}
${TARGET}: ${OBJS}
${CC} -o $@ ${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) *.bak *.1 *.ini
+1
View File
@@ -3,6 +3,7 @@ CC = gcc
SRC_DIR = ../src
INCLUDES = -I../include -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_PROPLIST
DEFINES += -DBACNET_PROPERTY_LISTS=1
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
+1
View File
@@ -8,6 +8,7 @@ CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
SRCS = $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/bactext.c \
$(SRC_DIR)/indtext.c \
$(SRC_DIR)/bacint.c \
+5 -4
View File
@@ -12,6 +12,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/bacerror.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/bactext.c \
$(SRC_DIR)/indtext.c \
$(SRC_DIR)/datetime.c \
@@ -23,19 +24,19 @@ SRCS = $(SRC_DIR)/bacdcode.c \
TARGET = rpm
all: ${TARGET}
OBJS = ${SRCS:.c=.o}
${TARGET}: ${OBJS}
${CC} -o $@ ${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) *.bak *.1 *.ini
+2 -1
View File
@@ -24,6 +24,7 @@ SRCS := $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/bacreal.c \
$(SRC_DIR)/bacerror.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/bactext.c \
$(SRC_DIR)/indtext.c \
$(SRC_DIR)/datetime.c \
@@ -34,7 +35,7 @@ SRCS := $(SRC_DIR)/bacdcode.c \
OBJS := ${SRCS:.c=.o}
all: ${TARGET}
${TARGET}: ${OBJS}
${CC} -o $@ ${OBJS}
+5 -4
View File
@@ -13,6 +13,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
$(SRC_DIR)/datetime.c \
$(SRC_DIR)/lighting.c \
$(SRC_DIR)/bacapp.c \
$(SRC_DIR)/bacdevobjpropref.c \
$(SRC_DIR)/bactext.c \
$(SRC_DIR)/indtext.c \
$(SRC_DIR)/wp.c \
@@ -21,19 +22,19 @@ SRCS = $(SRC_DIR)/bacdcode.c \
TARGET = wp
all: ${TARGET}
OBJS = ${SRCS:.c=.o}
${TARGET}: ${OBJS}
${CC} -o $@ ${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) *.bak *.1 *.ini