From 8a48241e14cb59d6bfea6c8eb88c69f6dc048149 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Wed, 4 Nov 2015 16:53:21 +0000
Subject: [PATCH] =?UTF-8?q?Fixed=20the=20unit=20tests=20after=20integratio?=
 =?UTF-8?q?n=20of=20property-list=20property=20and=20device-object-propert?=
 =?UTF-8?q?y-reference=20properties.=20Thank=20you=20for=20noticing=20it?=
 =?UTF-8?q?=20was=20broken,=20Nikola=20Jeli=C4=87,=20and=20for=20sending?=
 =?UTF-8?q?=20in=20fixes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bacnet-stack/demo/object/ai.mak       |  2 +-
 bacnet-stack/demo/object/ao.mak       |  2 +-
 bacnet-stack/demo/object/av.c         |  2 --
 bacnet-stack/demo/object/av.mak       | 10 +++++-----
 bacnet-stack/demo/object/bi.mak       | 10 +++++-----
 bacnet-stack/demo/object/bo.mak       | 10 +++++-----
 bacnet-stack/demo/object/bv.mak       | 10 +++++-----
 bacnet-stack/demo/object/command.mak  |  2 +-
 bacnet-stack/demo/object/csv.mak      |  2 +-
 bacnet-stack/demo/object/device.mak   |  2 ++
 bacnet-stack/demo/object/lc.mak       | 10 +++++-----
 bacnet-stack/demo/object/lo.mak       | 10 +++++-----
 bacnet-stack/demo/object/lsp.mak      | 10 +++++-----
 bacnet-stack/demo/object/ms-input.mak | 10 +++++-----
 bacnet-stack/demo/object/mso.mak      | 10 +++++-----
 bacnet-stack/demo/object/msv.mak      |  2 +-
 bacnet-stack/include/config.h         |  1 +
 bacnet-stack/src/keylist.c            |  1 -
 bacnet-stack/test.mak                 |  2 +-
 bacnet-stack/test/address.mak         | 11 ++++++-----
 bacnet-stack/test/bacapp.mak          |  3 +--
 bacnet-stack/test/cov.mak             | 11 ++++++-----
 bacnet-stack/test/datetime.mak        |  1 +
 bacnet-stack/test/event.mak           |  8 ++++----
 bacnet-stack/test/getevent.mak        |  9 +++++----
 bacnet-stack/test/lso.mak             | 10 +++++-----
 bacnet-stack/test/proplist.mak        |  1 +
 bacnet-stack/test/ptransfer.mak       |  1 +
 bacnet-stack/test/rpm.mak             |  9 +++++----
 bacnet-stack/test/timesync.mak        |  3 ++-
 bacnet-stack/test/wp.mak              |  9 +++++----
 31 files changed, 96 insertions(+), 88 deletions(-)

diff --git a/bacnet-stack/demo/object/ai.mak b/bacnet-stack/demo/object/ai.mak
index 399abd7f..613d001a 100755
--- a/bacnet-stack/demo/object/ai.mak
+++ b/bacnet-stack/demo/object/ai.mak
@@ -14,11 +14,11 @@ SRCS = ai.c \
 	$(SRC_DIR)/bacstr.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/proplist.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = analog_input
diff --git a/bacnet-stack/demo/object/ao.mak b/bacnet-stack/demo/object/ao.mak
index 6ca1c4e8..b0a79a4e 100755
--- a/bacnet-stack/demo/object/ao.mak
+++ b/bacnet-stack/demo/object/ao.mak
@@ -13,9 +13,9 @@ SRCS = ao.c \
 	$(SRC_DIR)/bacstr.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
 	$(TEST_DIR)/ctest.c
diff --git a/bacnet-stack/demo/object/av.c b/bacnet-stack/demo/object/av.c
index 4fb7a0a8..972eb63f 100644
--- a/bacnet-stack/demo/object/av.c
+++ b/bacnet-stack/demo/object/av.c
@@ -237,13 +237,11 @@ bool Analog_Value_Object_Name(
 int Analog_Value_Read_Property(
     BACNET_READ_PROPERTY_DATA * rpdata)
 {
-    int len = 0;
     int apdu_len = 0;   /* return value */
     BACNET_BIT_STRING bit_string;
     BACNET_CHARACTER_STRING char_string;
     float real_value = (float) 1.414;
     unsigned object_index = 0;
-    unsigned i = 0;
     bool state = false;
     uint8_t *apdu = NULL;
     ANALOG_VALUE_DESCR *CurrentAV;
diff --git a/bacnet-stack/demo/object/av.mak b/bacnet-stack/demo/object/av.mak
index 1b93078c..aa7e19ee 100644
--- a/bacnet-stack/demo/object/av.mak
+++ b/bacnet-stack/demo/object/av.mak
@@ -13,9 +13,9 @@ SRCS = av.c \
 	$(SRC_DIR)/bacstr.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
 	$(TEST_DIR)/ctest.c
@@ -23,19 +23,19 @@ SRCS = av.c \
 TARGET = analog_value
 
 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)
 
diff --git a/bacnet-stack/demo/object/bi.mak b/bacnet-stack/demo/object/bi.mak
index 4e6d1cf7..2d4c8a54 100644
--- a/bacnet-stack/demo/object/bi.mak
+++ b/bacnet-stack/demo/object/bi.mak
@@ -13,29 +13,29 @@ SRCS = bi.c \
 	$(SRC_DIR)/bacstr.c \
 	$(SRC_DIR)/bacreal.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 \
 	$(TEST_DIR)/ctest.c
 
 TARGET = binary_input
 
 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)
 
diff --git a/bacnet-stack/demo/object/bo.mak b/bacnet-stack/demo/object/bo.mak
index 43431f83..06c45c47 100755
--- a/bacnet-stack/demo/object/bo.mak
+++ b/bacnet-stack/demo/object/bo.mak
@@ -14,8 +14,8 @@ SRCS = bo.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(SRC_DIR)/indtext.c \
 	$(TEST_DIR)/ctest.c
@@ -23,19 +23,19 @@ SRCS = bo.c \
 TARGET = binary_output
 
 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)
 
diff --git a/bacnet-stack/demo/object/bv.mak b/bacnet-stack/demo/object/bv.mak
index 96948ba8..9daee511 100644
--- a/bacnet-stack/demo/object/bv.mak
+++ b/bacnet-stack/demo/object/bv.mak
@@ -14,28 +14,28 @@ SRCS = bv.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = binary_value
 
 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)
 
diff --git a/bacnet-stack/demo/object/command.mak b/bacnet-stack/demo/object/command.mak
index 99ad4eec..0ef15a77 100644
--- a/bacnet-stack/demo/object/command.mak
+++ b/bacnet-stack/demo/object/command.mak
@@ -14,11 +14,11 @@ SRCS = command.c \
 	$(SRC_DIR)/bacstr.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/proplist.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = command
diff --git a/bacnet-stack/demo/object/csv.mak b/bacnet-stack/demo/object/csv.mak
index 1bf1ff6e..cfe7e87f 100644
--- a/bacnet-stack/demo/object/csv.mak
+++ b/bacnet-stack/demo/object/csv.mak
@@ -14,9 +14,9 @@ SRCS = csv.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(TEST_DIR)/ctest.c
 
diff --git a/bacnet-stack/demo/object/device.mak b/bacnet-stack/demo/object/device.mak
index 369742e6..7107614c 100644
--- a/bacnet-stack/demo/object/device.mak
+++ b/bacnet-stack/demo/object/device.mak
@@ -9,6 +9,7 @@ DEFINES += -DTEST -DBACDL_TEST
 DEFINES += -DBACAPP_ALL
 DEFINES += -DMAX_TSM_TRANSACTIONS=0
 DEFINES += -DTEST_DEVICE
+DEFINES += -DBACNET_PROPERTY_LISTS=1
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
@@ -19,6 +20,7 @@ SRCS = device.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
 	$(SRC_DIR)/proplist.c \
diff --git a/bacnet-stack/demo/object/lc.mak b/bacnet-stack/demo/object/lc.mak
index 7d965390..669172e7 100644
--- a/bacnet-stack/demo/object/lc.mak
+++ b/bacnet-stack/demo/object/lc.mak
@@ -14,28 +14,28 @@ SRCS = lc.c ao.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = load_control
 
 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)
 
diff --git a/bacnet-stack/demo/object/lo.mak b/bacnet-stack/demo/object/lo.mak
index b611670b..d3872b9b 100755
--- a/bacnet-stack/demo/object/lo.mak
+++ b/bacnet-stack/demo/object/lo.mak
@@ -14,28 +14,28 @@ SRCS = lo.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = lighting_output
 
 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)
 
diff --git a/bacnet-stack/demo/object/lsp.mak b/bacnet-stack/demo/object/lsp.mak
index caefcc34..4235f4f3 100755
--- a/bacnet-stack/demo/object/lsp.mak
+++ b/bacnet-stack/demo/object/lsp.mak
@@ -14,28 +14,28 @@ SRCS = lsp.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = life_safety_point
 
 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)
 
diff --git a/bacnet-stack/demo/object/ms-input.mak b/bacnet-stack/demo/object/ms-input.mak
index 0a124e17..54d0971d 100644
--- a/bacnet-stack/demo/object/ms-input.mak
+++ b/bacnet-stack/demo/object/ms-input.mak
@@ -14,28 +14,28 @@ SRCS = ms-input.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = multistate_input
 
 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)
 
diff --git a/bacnet-stack/demo/object/mso.mak b/bacnet-stack/demo/object/mso.mak
index b66745cf..c39ecde0 100644
--- a/bacnet-stack/demo/object/mso.mak
+++ b/bacnet-stack/demo/object/mso.mak
@@ -14,28 +14,28 @@ SRCS = mso.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
 	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(TEST_DIR)/ctest.c
 
 TARGET = multistate_output
 
 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)
 
diff --git a/bacnet-stack/demo/object/msv.mak b/bacnet-stack/demo/object/msv.mak
index 49e67182..e8c9155f 100644
--- a/bacnet-stack/demo/object/msv.mak
+++ b/bacnet-stack/demo/object/msv.mak
@@ -14,8 +14,8 @@ SRCS = msv.c \
 	$(SRC_DIR)/bacreal.c \
 	$(SRC_DIR)/datetime.c \
 	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
 	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/proplist.c \
 	$(SRC_DIR)/lighting.c \
 	$(SRC_DIR)/indtext.c \
 	$(TEST_DIR)/ctest.c
diff --git a/bacnet-stack/include/config.h b/bacnet-stack/include/config.h
index 5e23ca36..da806ec0 100644
--- a/bacnet-stack/include/config.h
+++ b/bacnet-stack/include/config.h
@@ -129,6 +129,7 @@
     defined(BACAPP_LIGHTING_COMMAND) || \
     defined(BACAPP_DEVICE_OBJECT_PROP_REF) || \
     defined(BACAPP_OBJECT_ID))
+#define BACAPP_ALL
 #endif
 
 #if defined (BACAPP_ALL)
diff --git a/bacnet-stack/src/keylist.c b/bacnet-stack/src/keylist.c
index 8f576381..03b5422c 100644
--- a/bacnet-stack/src/keylist.c
+++ b/bacnet-stack/src/keylist.c
@@ -722,7 +722,6 @@ int main(
     void)
 {
     Test *pTest;
-    bool rc;
 
     pTest = ct_create("keylist", NULL);
     testKeyList(pTest);
diff --git a/bacnet-stack/test.mak b/bacnet-stack/test.mak
index eda70629..0225f90e 100644
--- a/bacnet-stack/test.mak
+++ b/bacnet-stack/test.mak
@@ -131,7 +131,7 @@ key: logfile test/key.mak
 	( ./test/key >> ${LOGFILE} )
 	$(MAKE) -s -C test -f key.mak clean
 
-lighting: lighting test/lighting.mak
+lighting: logfile test/lighting.mak
 	$(MAKE) -s -C test -f lighting.mak clean all
 	( ./test/lighting >> ${LOGFILE} )
 	$(MAKE) -s -C test -f lighting.mak clean
diff --git a/bacnet-stack/test/address.mak b/bacnet-stack/test/address.mak
index 6b48893b..67906d28 100644
--- a/bacnet-stack/test/address.mak
+++ b/bacnet-stack/test/address.mak
@@ -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
diff --git a/bacnet-stack/test/bacapp.mak b/bacnet-stack/test/bacapp.mak
index dc0744a7..e90d8a8e 100644
--- a/bacnet-stack/test/bacapp.mak
+++ b/bacnet-stack/test/bacapp.mak
@@ -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 \
diff --git a/bacnet-stack/test/cov.mak b/bacnet-stack/test/cov.mak
index 5ed5c486..400265c8 100644
--- a/bacnet-stack/test/cov.mak
+++ b/bacnet-stack/test/cov.mak
@@ -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
 
diff --git a/bacnet-stack/test/datetime.mak b/bacnet-stack/test/datetime.mak
index 21b6c3e1..110a56d3 100644
--- a/bacnet-stack/test/datetime.mak
+++ b/bacnet-stack/test/datetime.mak
@@ -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 \
diff --git a/bacnet-stack/test/event.mak b/bacnet-stack/test/event.mak
index ceea0081..ebd38d7b 100644
--- a/bacnet-stack/test/event.mak
+++ b/bacnet-stack/test/event.mak
@@ -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
 
diff --git a/bacnet-stack/test/getevent.mak b/bacnet-stack/test/getevent.mak
index 22b79874..07d10605 100644
--- a/bacnet-stack/test/getevent.mak
+++ b/bacnet-stack/test/getevent.mak
@@ -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
 
diff --git a/bacnet-stack/test/lso.mak b/bacnet-stack/test/lso.mak
index bf754eec..b161e560 100644
--- a/bacnet-stack/test/lso.mak
+++ b/bacnet-stack/test/lso.mak
@@ -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
 
diff --git a/bacnet-stack/test/proplist.mak b/bacnet-stack/test/proplist.mak
index 0c5b9e9b..31b47fff 100644
--- a/bacnet-stack/test/proplist.mak
+++ b/bacnet-stack/test/proplist.mak
@@ -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
 
diff --git a/bacnet-stack/test/ptransfer.mak b/bacnet-stack/test/ptransfer.mak
index 8a5e1a81..e284edab 100644
--- a/bacnet-stack/test/ptransfer.mak
+++ b/bacnet-stack/test/ptransfer.mak
@@ -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 \
diff --git a/bacnet-stack/test/rpm.mak b/bacnet-stack/test/rpm.mak
index 573cb843..3278d579 100644
--- a/bacnet-stack/test/rpm.mak
+++ b/bacnet-stack/test/rpm.mak
@@ -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
 
diff --git a/bacnet-stack/test/timesync.mak b/bacnet-stack/test/timesync.mak
index 26bd1733..24508c61 100644
--- a/bacnet-stack/test/timesync.mak
+++ b/bacnet-stack/test/timesync.mak
@@ -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}
 
diff --git a/bacnet-stack/test/wp.mak b/bacnet-stack/test/wp.mak
index d35c6756..771ff7ee 100644
--- a/bacnet-stack/test/wp.mak
+++ b/bacnet-stack/test/wp.mak
@@ -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