From cf5587c29ddd0fe46cdbcaab1ccafa44d2034552 Mon Sep 17 00:00:00 2001 From: skarg Date: Mon, 29 Oct 2007 13:58:05 +0000 Subject: [PATCH] Correcting unit test makefiles. Corrected error in config.h for BACAPP NULL values. --- bacnet-stack/include/config.h | 13 +++++++------ bacnet-stack/src/bacapp.c | 4 ++-- bacnet-stack/test/abort.mak | 19 +++++++++---------- bacnet-stack/test/address.mak | 16 ++++++++-------- bacnet-stack/test/arf.mak | 18 +++++++++--------- bacnet-stack/test/awf.mak | 17 +++++++++-------- bacnet-stack/test/bacapp.mak | 28 +++++++++++++++------------- 7 files changed, 59 insertions(+), 56 deletions(-) diff --git a/bacnet-stack/include/config.h b/bacnet-stack/include/config.h index d43b78b4..d67411ba 100644 --- a/bacnet-stack/include/config.h +++ b/bacnet-stack/include/config.h @@ -68,18 +68,19 @@ /* BACAPP decodes WriteProperty service requests Choose the datatypes that your application supports */ #if defined (BACAPP_ALL) + #define BACAPP_NULL #define BACAPP_BOOLEAN #define BACAPP_UNSIGNED #define BACAPP_SIGNED #define BACAPP_REAL /* FIXME: not implemented #define BACAPP_DOUBLE */ - #define BACAPP_OCTET_STRING - #define BACAPP_CHARACTER_STRING - #define BACAPP_BIT_STRING + #define BACAPP_OCTET_STRING + #define BACAPP_CHARACTER_STRING + #define BACAPP_BIT_STRING #define BACAPP_ENUMERATED - #define BACAPP_DATE - #define BACAPP_TIME - #define BACAPP_OBJECT_ID + #define BACAPP_DATE + #define BACAPP_TIME + #define BACAPP_OBJECT_ID #endif #endif diff --git a/bacnet-stack/src/bacapp.c b/bacnet-stack/src/bacapp.c index 68b05c06..c3eac161 100644 --- a/bacnet-stack/src/bacapp.c +++ b/bacnet-stack/src/bacapp.c @@ -912,7 +912,6 @@ bool bacapp_same_value(BACNET_APPLICATION_DATA_VALUE * value, BACNET_APPLICATION_DATA_VALUE * test_value) { bool status = false; /*return value */ - bool tag /* does the tag match? */ if (test_value->tag == value->tag) @@ -1172,7 +1171,8 @@ void testBACnetApplicationData(Test * pTest) status = bacapp_parse_application_data(BACNET_APPLICATION_TAG_NULL, NULL, &value); ct_test(pTest, status == true); - ct_test(pTest, testBACnetApplicationDataValue(&value)); + status = testBACnetApplicationDataValue(&value); + ct_test(pTest, status == true); status = bacapp_parse_application_data(BACNET_APPLICATION_TAG_BOOLEAN, "1", &value); diff --git a/bacnet-stack/test/abort.mak b/bacnet-stack/test/abort.mak index e4ba8225..1230a345 100644 --- a/bacnet-stack/test/abort.mak +++ b/bacnet-stack/test/abort.mak @@ -1,18 +1,17 @@ #Makefile to build test case CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -#CFLAGS = -Wall -I. -g -CFLAGS = -Wall -Iinclude -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_ABORT -g +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ABORT -SRC_DIR = src +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g SRCS = $(SRC_DIR)/bacdcode.c \ - $(SRC_DIR)/bacint.c \ - $(SRC_DIR)/bacstr.c \ - $(SRC_DIR)/abort.c \ - test/ctest.c + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/abort.c \ + ctest.c TARGET = abort diff --git a/bacnet-stack/test/address.mak b/bacnet-stack/test/address.mak index 3199b2d2..0ca25ad7 100644 --- a/bacnet-stack/test/address.mak +++ b/bacnet-stack/test/address.mak @@ -1,14 +1,14 @@ #Makefile to build test case CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -#CFLAGS = -Wall -I. -g -CFLAGS = -Wall -Iinclude -Itest -DTEST -DTEST_ADDRESS -g +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ADDRESS -SRCS = src/address.c \ - src/bacaddr.c \ - test/ctest.c +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g + +SRCS = $(SRC_DIR)/address.c \ + $(SRC_DIR)/bacaddr.c \ + ctest.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/test/arf.mak b/bacnet-stack/test/arf.mak index dc565f10..1a1cc155 100644 --- a/bacnet-stack/test/arf.mak +++ b/bacnet-stack/test/arf.mak @@ -1,16 +1,16 @@ #Makefile to build test case CC = gcc -BASEDIR = . -# -g for debugging with gdb -DEFINES = -DBACFILE=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_READ_FILE -INCLUDES = -Iinclude -Idemo/object -Itest +SRC_DIR = ../src +INCLUDES = -I../include -I. -I../demo/object +DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_READ_FILE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g -SRCS = src/bacdcode.c \ - src/bacint.c \ - src/bacstr.c \ - src/arf.c \ - test/ctest.c +SRCS = $(SRC_DIR)/bacdcode.c \ + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/arf.c \ + ctest.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/test/awf.mak b/bacnet-stack/test/awf.mak index c54fc7ef..d83b931d 100644 --- a/bacnet-stack/test/awf.mak +++ b/bacnet-stack/test/awf.mak @@ -1,16 +1,17 @@ #Makefile to build test case CC = gcc -BASEDIR = . -DEFINES = -DBACFILE=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_WRITE_FILE -INCLUDES = -Iinclude -Idemo/object -Itest +SRC_DIR = ../src +INCLUDES = -I../include -I. -I../demo/object +DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_WRITE_FILE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g -SRCS = src/bacdcode.c \ - src/bacint.c \ - src/bacstr.c \ - src/awf.c \ - test/ctest.c +SRCS = $(SRC_DIR)/bacdcode.c \ + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/awf.c \ + ctest.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/test/bacapp.mak b/bacnet-stack/test/bacapp.mak index d80a8df9..851312ba 100644 --- a/bacnet-stack/test/bacapp.mak +++ b/bacnet-stack/test/bacapp.mak @@ -1,19 +1,21 @@ #Makefile to build test case CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACNET_APPLICATION_DATA -CFLAGS = -Wall -Iinclude -Itest -g $(DEFINES) -SRCS = src/bacdcode.c \ - src/bacint.c \ - src/bacstr.c \ - src/bacapp.c \ - src/datetime.c \ - src/bactext.c \ - src/indtext.c \ - test/ctest.c +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_BACNET_APPLICATION_DATA + +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g + +SRCS = $(SRC_DIR)/bacdcode.c \ + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/bacapp.c \ + $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/bactext.c \ + $(SRC_DIR)/indtext.c \ + ctest.c OBJS = ${SRCS:.c=.o}