From bc1017ee60c5149c48d6922565842f6ba2ccebb9 Mon Sep 17 00:00:00 2001 From: skarg Date: Wed, 13 Mar 2013 22:34:08 +0000 Subject: [PATCH] cleaned up warnings and build of unit tests --- bacnet-stack/demo/object/ms-input.c | 9 +++++++++ bacnet-stack/src/bacapp.c | 3 +-- bacnet-stack/test/ringbuf.mak | 2 +- bacnet-stack/unittest.sh | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bacnet-stack/demo/object/ms-input.c b/bacnet-stack/demo/object/ms-input.c index bda34faf..6eb2bd53 100644 --- a/bacnet-stack/demo/object/ms-input.c +++ b/bacnet-stack/demo/object/ms-input.c @@ -783,6 +783,15 @@ bool Multistate_Input_Write_Property( #include #include "ctest.h" + +bool Device_Valid_Object_Name( + BACNET_CHARACTER_STRING * object_name, + int *object_type, + uint32_t * object_instance) +{ + return true; +} + bool WPValidateArgType( BACNET_APPLICATION_DATA_VALUE * pValue, uint8_t ucExpectedTag, diff --git a/bacnet-stack/src/bacapp.c b/bacnet-stack/src/bacapp.c index 9792e943..521126ba 100644 --- a/bacnet-stack/src/bacapp.c +++ b/bacnet-stack/src/bacapp.c @@ -1884,12 +1884,11 @@ static bool testBACnetApplicationDataValue( BACNET_APPLICATION_DATA_VALUE * value) { uint8_t apdu[480] = { 0 }; - int len = 0; int apdu_len = 0; BACNET_APPLICATION_DATA_VALUE test_value; apdu_len = bacapp_encode_application_data(&apdu[0], value); - len = bacapp_decode_application_data(&apdu[0], apdu_len, &test_value); + bacapp_decode_application_data(&apdu[0], apdu_len, &test_value); return bacapp_same_value(value, &test_value); } diff --git a/bacnet-stack/test/ringbuf.mak b/bacnet-stack/test/ringbuf.mak index 167ada68..a091d8ce 100644 --- a/bacnet-stack/test/ringbuf.mak +++ b/bacnet-stack/test/ringbuf.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I../include -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_RINGBUF +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_RING_BUFFER CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/bacnet-stack/unittest.sh b/bacnet-stack/unittest.sh index ec0da720..8b7195bd 100755 --- a/bacnet-stack/unittest.sh +++ b/bacnet-stack/unittest.sh @@ -1,6 +1,6 @@ #!/bin/sh # Unit tests builder / runner for this project -make -f test.mak clean +make -s -f test.mak clean make -f test.mak cat test.log | grep Failed