dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename test macro to prevent collisions (#91)

Browse Source 
* refactor: rename test macro to prevent collisions

* style: align cmake epilog

* refactor: rename define in makefiles
This commit is contained in:
Carlos Gomes Martinho
2020-05-28 15:55:05 +02:00
committed by GitHub
parent cbfa74e48d
commit 981d4036c8
220 changed files with 308 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+14 -14
View File
@@ -61,20 +61,6 @@ option(
set(BACNET_PROTOCOL_REVISION 19) set(BACNET_PROTOCOL_REVISION 19)
message(STATUS "BACNET: using cmake ${CMAKE_VERSION}")
message(STATUS "BACNET: CMAKE_C_COMPILER_ID \"${CMAKE_C_COMPILER_ID}\"")
message(STATUS "BACNET: CMAKE_C_COMPILER_VERSION \"${CMAKE_C_COMPILER_VERSION}\"")
message(STATUS "BACNET: CMAKE_CXX_COMPILER_ID \"${CMAKE_CXX_COMPILER_ID}\"")
message(STATUS "BACNET: CMAKE_CXX_COMPILER_VERSION \"${CMAKE_CXX_COMPILER_VERSION}\"")
message(STATUS "BACNET: CMAKE_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\"")
message(STATUS "BACNET: BACNET_PROTOCOL_REVISION \"${BACNET_PROTOCOL_REVISION}\"")
message(STATUS "BACNET: BACDL_BIP6 \"${BACDL_BIP6}\"")
message(STATUS "BACNET: BACDL_BIP \"${BACDL_BIP}\"")
message(STATUS "BACNET: BACDL_ARCNET \"${BACDL_ARCNET}\"")
message(STATUS "BACNET: BACDL_MSTP \"${BACDL_MSTP}\"")
message(STATUS "BACNET: BACDL_ETHERNET \"${BACDL_ETHERNET}\"")
message(STATUS "BACNET: BACDL_NONE \"${BACDL_NONE}\"")
# #
# library # library
# #
@@ -707,3 +693,17 @@ install(
COMPONENT dev COMPONENT dev
FILES_MATCHING FILES_MATCHING
PATTERN "*.h") PATTERN "*.h")
message(STATUS "BACNET: using cmake:....................\"${CMAKE_VERSION}\"")
message(STATUS "BACNET: CMAKE_C_COMPILER_ID:............\"${CMAKE_C_COMPILER_ID}\"")
message(STATUS "BACNET: CMAKE_C_COMPILER_VERSION:.......\"${CMAKE_C_COMPILER_VERSION}\"")
message(STATUS "BACNET: CMAKE_CXX_COMPILER_ID:..........\"${CMAKE_CXX_COMPILER_ID}\"")
message(STATUS "BACNET: CMAKE_CXX_COMPILER_VERSION:.....\"${CMAKE_CXX_COMPILER_VERSION}\"")
message(STATUS "BACNET: CMAKE_INSTALL_PREFIX:...........\"${CMAKE_INSTALL_PREFIX}\"")
message(STATUS "BACNET: BACNET_PROTOCOL_REVISION:.......\"${BACNET_PROTOCOL_REVISION}\"")
message(STATUS "BACNET: BACDL_BIP6:.....................\"${BACDL_BIP6}\"")
message(STATUS "BACNET: BACDL_BIP:......................\"${BACDL_BIP}\"")
message(STATUS "BACNET: BACDL_ARCNET:...................\"${BACDL_ARCNET}\"")
message(STATUS "BACNET: BACDL_MSTP:.....................\"${BACDL_MSTP}\"")
message(STATUS "BACNET: BACDL_ETHERNET:.................\"${BACDL_ETHERNET}\"")
message(STATUS "BACNET: BACDL_NONE:.....................\"${BACDL_NONE}\"")
apps/piface/device.c
+2 -2
View File
@@ -1586,7 +1586,7 @@ void Routing_Device_Init(uint32_t first_object_instance)
#endif /* BAC_ROUTING */ #endif /* BAC_ROUTING */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1677,4 +1677,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_DEVICE */ #endif /* TEST_DEVICE */
#endif /* TEST */ #endif /* BAC_TEST */
ports/arduino_uno/av.c
+2 -2
View File
@@ -198,7 +198,7 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data,
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -246,4 +246,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ANALOG_VALUE */ #endif /* TEST_ANALOG_VALUE */
#endif /* TEST */ #endif /* BAC_TEST */
ports/arduino_uno/av.h
+1 -1
View File
@@ -64,7 +64,7 @@ extern "C" {
void Analog_Value_Init(void); void Analog_Value_Init(void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
void testAnalog_Value(Test * pTest); void testAnalog_Value(Test * pTest);
#endif #endif
ports/arduino_uno/bv.c
+2 -2
View File
@@ -245,7 +245,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data,
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -293,4 +293,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BINARY_VALUE */ #endif /* TEST_BINARY_VALUE */
#endif /* TEST */ #endif /* BAC_TEST */
ports/arduino_uno/bv.h
+1 -1
View File
@@ -61,7 +61,7 @@ extern "C" {
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code); BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
void testBinary_Value(Test * pTest); void testBinary_Value(Test * pTest);
#endif #endif
ports/atmega168/ai.h
+1 -1
View File
@@ -82,7 +82,7 @@ extern "C" {
void Analog_Input_Init( void Analog_Input_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
void testAnalogInput( void testAnalogInput(
Test * pTest); Test * pTest);
ports/atmega168/av.c
+2 -2
View File
@@ -217,7 +217,7 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -265,4 +265,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ANALOG_VALUE */ #endif /* TEST_ANALOG_VALUE */
#endif /* TEST */ #endif /* BAC_TEST */
ports/atmega168/av.h
+1 -1
View File
@@ -74,7 +74,7 @@ extern "C" {
void Analog_Value_Init( void Analog_Value_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
void testAnalog_Value( void testAnalog_Value(
Test * pTest); Test * pTest);
ports/atmega168/bv.c
+2 -2
View File
@@ -261,7 +261,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -309,4 +309,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BINARY_VALUE */ #endif /* TEST_BINARY_VALUE */
#endif /* TEST */ #endif /* BAC_TEST */
ports/atmega168/bv.h
+1 -1
View File
@@ -69,7 +69,7 @@ extern "C" {
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code); BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
void testBinary_Value( void testBinary_Value(
Test * pTest); Test * pTest);
ports/esp32/src/ai.c
+2 -2
View File
@@ -1325,7 +1325,7 @@ int Analog_Input_Alarm_Summary(
} }
#endif /* defined(INTRINSIC_REPORTING) */ #endif /* defined(INTRINSIC_REPORTING) */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1398,4 +1398,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ANALOG_INPUT */ #endif /* TEST_ANALOG_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
ports/esp32/src/ai.h
+1 -1
View File
@@ -162,7 +162,7 @@ extern "C" {
void Analog_Input_Init( void Analog_Input_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
void testAnalogInput( void testAnalogInput(
Test * pTest); Test * pTest);
ports/esp32/src/bo.c
+2 -2
View File
@@ -449,7 +449,7 @@ bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -514,4 +514,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BINARY_INPUT */ #endif /* TEST_BINARY_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
ports/esp32/src/bo.h
+1 -1
View File
@@ -129,7 +129,7 @@ extern "C" {
void Binary_Output_Cleanup( void Binary_Output_Cleanup(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
void testBinaryOutput( void testBinaryOutput(
Test * pTest); Test * pTest);
ports/esp32/src/device.c
+2 -2
View File
@@ -1782,7 +1782,7 @@ void Routing_Device_Init(uint32_t first_object_instance)
#endif /* BAC_ROUTING */ #endif /* BAC_ROUTING */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1873,4 +1873,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_DEVICE */ #endif /* TEST_DEVICE */
#endif /* TEST */ #endif /* BAC_TEST */
ports/stm32f10x/automac.c
+1 -1
View File
@@ -322,7 +322,7 @@ void automac_init(void)
PFM_Cycle_Complete = false; PFM_Cycle_Complete = false;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
src/bacnet/abort.c
+2 -2
View File
@@ -199,7 +199,7 @@ int abort_decode_service_request(
} }
#endif #endif
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -347,4 +347,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ABORT */ #endif /* TEST_ABORT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/abort.h
+1 -1
View File
@@ -54,7 +54,7 @@ extern "C" {
uint8_t * invoke_id, uint8_t * invoke_id,
uint8_t * abort_reason); uint8_t * abort_reason);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAbort( void testAbort(
src/bacnet/alarm_ack.c
+2 -2
View File
@@ -174,7 +174,7 @@ int alarm_ack_decode_service_request(
return len; return len;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@@ -270,4 +270,4 @@ int main(void)
} }
#endif /* TEST_ALARM_ACK */ #endif /* TEST_ALARM_ACK */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/arf.c
+2 -2
View File
@@ -378,7 +378,7 @@ int arf_ack_decode_apdu(uint8_t *apdu,
return len; return len;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -566,4 +566,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_xxx */ #endif /* TEST_xxx */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/arf.h
+1 -1
View File
@@ -103,7 +103,7 @@ extern "C" {
uint8_t * invoke_id, uint8_t * invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data); BACNET_ATOMIC_READ_FILE_DATA * data);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
src/bacnet/awf.c
+2 -2
View File
@@ -312,7 +312,7 @@ int awf_ack_decode_apdu(uint8_t *apdu,
return len; return len;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -487,4 +487,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_WRITE_PROPERTY */ #endif /* TEST_WRITE_PROPERTY */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/awf.h
+1 -1
View File
@@ -97,7 +97,7 @@ extern "C" {
uint8_t * invoke_id, uint8_t * invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data); BACNET_ATOMIC_WRITE_FILE_DATA * data);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
src/bacnet/bacapp.c
+2 -2
View File
@@ -1560,7 +1560,7 @@ void bacapp_property_value_list_init(BACNET_PROPERTY_VALUE *value, size_t count)
} }
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -2189,4 +2189,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BACNET_APPLICATION_DATA */ #endif /* TEST_BACNET_APPLICATION_DATA */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/bacapp.h
+2 -2
View File
@@ -229,7 +229,7 @@ extern "C" {
BACNET_PROPERTY_ID property); BACNET_PROPERTY_ID property);
#ifndef BACAPP_PRINT_ENABLED #ifndef BACAPP_PRINT_ENABLED
#if PRINT_ENABLED || defined TEST #if PRINT_ENABLED || defined BAC_TEST
#define BACAPP_PRINT_ENABLED #define BACAPP_PRINT_ENABLED
#define BACAPP_SNPRINTF_ENABLED #define BACAPP_SNPRINTF_ENABLED
#endif #endif
@@ -259,7 +259,7 @@ extern "C" {
#define bacapp_print_value(x,y) false #define bacapp_print_value(x,y) false
#endif #endif
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
#include "bacnet/datetime.h" #include "bacnet/datetime.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
src/bacnet/bacdcode.c
+2 -2
View File
@@ -2532,7 +2532,7 @@ int decode_context_bacnet_address(
} }
/* end of decoding_encoding.c */ /* end of decoding_encoding.c */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
@@ -3837,4 +3837,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_DECODE */ #endif /* TEST_DECODE */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/bacdcode.h
+1 -1
View File
@@ -629,7 +629,7 @@ extern "C" {
/* true if the tag is a closing tag */ /* true if the tag is a closing tag */
#define IS_CLOSING_TAG(x) ((x & 0x07) == 7) #define IS_CLOSING_TAG(x) ((x & 0x07) == 7)
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void test_BACDCode( void test_BACDCode(
src/bacnet/bacdevobjpropref.c
+2 -2
View File
@@ -305,7 +305,7 @@ int bacapp_decode_context_device_obj_ref(
return len; return len;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -433,4 +433,4 @@ int main(void)
} }
#endif /* TEST_DEV_ID_PROP_REF */ #endif /* TEST_DEV_ID_PROP_REF */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/bacdevobjpropref.h
+1 -1
View File
@@ -100,7 +100,7 @@ extern "C" {
uint8_t tag_number, uint8_t tag_number,
BACNET_DEVICE_OBJECT_REFERENCE * value); BACNET_DEVICE_OBJECT_REFERENCE * value);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testBACnetDeviceObjectPropertyReference( void testBACnetDeviceObjectPropertyReference(
src/bacnet/bacerror.c
+2 -2
View File
@@ -125,7 +125,7 @@ int bacerror_decode_service_request(uint8_t *apdu,
} }
#endif #endif
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -255,4 +255,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ERROR */ #endif /* TEST_ERROR */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/bacerror.h
+1 -1
View File
@@ -57,7 +57,7 @@ extern "C" {
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code); BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
int bacerror_decode_apdu( int bacerror_decode_apdu(
src/bacnet/bacint.c
+2 -2
View File
@@ -413,7 +413,7 @@ int decode_signed32(uint8_t *apdu, int32_t *value)
} }
#endif #endif
/* end of decoding_encoding.c */ /* end of decoding_encoding.c */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
@@ -651,4 +651,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BACINT */ #endif /* TEST_BACINT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/bacint.h
+1 -1
View File
@@ -137,7 +137,7 @@ extern "C" {
uint8_t * apdu, uint8_t * apdu,
int32_t * value); int32_t * value);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testBACnetIntegers( void testBACnetIntegers(
src/bacnet/bacpropstates.c
+2 -2
View File
@@ -293,7 +293,7 @@ int bacapp_encode_property_state(uint8_t *apdu, BACNET_PROPERTY_STATE *value)
return len; return len;
} }
#ifdef TEST #ifdef BAC_TEST
#include <string.h> /* for memset */ #include <string.h> /* for memset */
void testPropStates(Test *pTest) void testPropStates(Test *pTest)
@@ -419,4 +419,4 @@ int main(void)
} }
#endif /* TEST_PROP_STATES */ #endif /* TEST_PROP_STATES */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/bacstr.c
+2 -2
View File
@@ -918,7 +918,7 @@ bool octetstring_value_same(
} }
#endif #endif
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -1129,4 +1129,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BACSTR */ #endif /* TEST_BACSTR */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/bacstr.h
+1 -1
View File
@@ -237,7 +237,7 @@ extern "C" {
BACNET_OCTET_STRING * octet_string1, BACNET_OCTET_STRING * octet_string1,
BACNET_OCTET_STRING * octet_string2); BACNET_OCTET_STRING * octet_string2);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testBACnetStrings( void testBACnetStrings(
src/bacnet/bactext.h
+1 -1
View File
@@ -28,7 +28,7 @@
#if PRINT_ENABLED #if PRINT_ENABLED
#define BACTEXT_PRINT_ENABLED #define BACTEXT_PRINT_ENABLED
#else #else
#ifdef TEST #ifdef BAC_TEST
#define BACTEXT_PRINT_ENABLED #define BACTEXT_PRINT_ENABLED
#endif #endif
#endif #endif
src/bacnet/basic/bbmd6/vmac.c
+1 -1
View File
@@ -259,7 +259,7 @@ void VMAC_Init(void)
} }
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
src/bacnet/basic/bbmd6/vmac.h
+1 -1
View File
@@ -50,7 +50,7 @@ extern "C" {
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void VMAC_Init(void); void VMAC_Init(void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testVMAC( void testVMAC(
src/bacnet/basic/binding/address.c
+2 -2
View File
@@ -1139,7 +1139,7 @@ void address_cache_timer(uint16_t uSeconds)
} }
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1312,4 +1312,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ADDRESS */ #endif /* TEST_ADDRESS */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/acc.mak
+1 -1
View File
@@ -4,7 +4,7 @@ SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
HANDLER_DIR = ../handler HANDLER_DIR = ../handler
INCLUDES = -I../../include -I$(TEST_DIR) -I. -I$(HANDLER_DIR) INCLUDES = -I../../include -I$(TEST_DIR) -I. -I$(HANDLER_DIR)
DEFINES = -DBIG_ENDIAN=0 -DBACDL_ALL -DTEST -DTEST_ACCUMULATOR DEFINES = -DBIG_ENDIAN=0 -DBACDL_ALL -DBAC_TEST -DTEST_ACCUMULATOR
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/access_credential.c
+2 -2
View File
@@ -374,7 +374,7 @@ bool Access_Credential_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -439,4 +439,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ACCESS_CREDENTIAL */ #endif /* TEST_ACCESS_CREDENTIAL */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/access_credential.h
+1 -1
View File
@@ -127,7 +127,7 @@ extern "C" {
void Access_Credential_Init( void Access_Credential_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAccessCredential( void testAccessCredential(
src/bacnet/basic/object/access_credential.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ACCESS_CREDENTIAL DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ACCESS_CREDENTIAL
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/access_door.c
+2 -2
View File
@@ -566,7 +566,7 @@ bool Access_Door_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -631,4 +631,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ACCESS_DOOR */ #endif /* TEST_ACCESS_DOOR */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/access_door.h
+1 -1
View File
@@ -159,7 +159,7 @@ extern "C" {
void Access_Door_Init( void Access_Door_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAccessDoor( void testAccessDoor(
src/bacnet/basic/object/access_door.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ACCESS_DOOR DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ACCESS_DOOR
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/access_point.c
+2 -2
View File
@@ -363,7 +363,7 @@ bool Access_Point_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -428,4 +428,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ACCESS_POINT */ #endif /* TEST_ACCESS_POINT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/access_point.h
+1 -1
View File
@@ -124,7 +124,7 @@ extern "C" {
void Access_Point_Init( void Access_Point_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAccessPoint( void testAccessPoint(
src/bacnet/basic/object/access_point.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ACCESS_POINT DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ACCESS_POINT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/access_rights.c
+2 -2
View File
@@ -336,7 +336,7 @@ bool Access_Rights_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -401,4 +401,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ACCESS_RIGHTS */ #endif /* TEST_ACCESS_RIGHTS */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/access_rights.h
+1 -1
View File
@@ -112,7 +112,7 @@ extern "C" {
void Access_Rights_Init( void Access_Rights_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAccessRights( void testAccessRights(
src/bacnet/basic/object/access_rights.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ACCESS_RIGHTS DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ACCESS_RIGHTS
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/access_user.c
+2 -2
View File
@@ -278,7 +278,7 @@ bool Access_User_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -343,4 +343,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ACCESS_USER */ #endif /* TEST_ACCESS_USER */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/access_user.h
+1 -1
View File
@@ -105,7 +105,7 @@ extern "C" {
void Access_User_Init( void Access_User_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAccessUser( void testAccessUser(
src/bacnet/basic/object/access_user.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ACCESS_USER DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ACCESS_USER
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/access_zone.c
+2 -2
View File
@@ -344,7 +344,7 @@ bool Access_Zone_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -409,4 +409,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ACCESS_ZONE */ #endif /* TEST_ACCESS_ZONE */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/access_zone.h
+1 -1
View File
@@ -121,7 +121,7 @@ extern "C" {
void Access_Zone_Init( void Access_Zone_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAccessZone( void testAccessZone(
src/bacnet/basic/object/access_zone.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ACCESS_ZONE DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ACCESS_ZONE
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/ai.c
+2 -2
View File
@@ -1329,7 +1329,7 @@ int Analog_Input_Alarm_Summary(
} }
#endif /* defined(INTRINSIC_REPORTING) */ #endif /* defined(INTRINSIC_REPORTING) */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1402,4 +1402,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ANALOG_INPUT */ #endif /* TEST_ANALOG_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/ai.h
+1 -1
View File
@@ -193,7 +193,7 @@ extern "C" {
void Analog_Input_Init( void Analog_Input_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAnalogInput( void testAnalogInput(
src/bacnet/basic/object/ai.mak
+1 -1
View File
@@ -4,7 +4,7 @@ SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
HANDLER_DIR = ../handler HANDLER_DIR = ../handler
INCLUDES = -I../../include -I$(TEST_DIR) -I. -I$(HANDLER_DIR) INCLUDES = -I../../include -I$(TEST_DIR) -I. -I$(HANDLER_DIR)
DEFINES = -DBIG_ENDIAN=0 -DBACDL_ALL -DTEST -DTEST_ANALOG_INPUT DEFINES = -DBIG_ENDIAN=0 -DBACDL_ALL -DBAC_TEST -DTEST_ANALOG_INPUT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/ao.c
+2 -2
View File
@@ -482,7 +482,7 @@ bool Analog_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -555,4 +555,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ANALOG_INPUT */ #endif /* TEST_ANALOG_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/ao.h
+1 -1
View File
@@ -161,7 +161,7 @@ extern "C" {
void Analog_Output_Init( void Analog_Output_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAnalogOutput( void testAnalogOutput(
src/bacnet/basic/object/ao.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ANALOG_OUTPUT DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ANALOG_OUTPUT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/av.c
+2 -2
View File
@@ -1427,7 +1427,7 @@ int Analog_Value_Alarm_Summary(
} }
#endif /* defined(INTRINSIC_REPORTING) */ #endif /* defined(INTRINSIC_REPORTING) */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1492,4 +1492,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_ANALOG_VALUE */ #endif /* TEST_ANALOG_VALUE */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/av.h
+1 -1
View File
@@ -201,7 +201,7 @@ extern "C" {
void Analog_Value_Init( void Analog_Value_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testAnalog_Value( void testAnalog_Value(
src/bacnet/basic/object/av.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ANALOG_VALUE DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_ANALOG_VALUE
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/bi.c
+2 -2
View File
@@ -484,7 +484,7 @@ bool Binary_Input_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -549,4 +549,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BINARY_INPUT */ #endif /* TEST_BINARY_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/bi.h
+1 -1
View File
@@ -155,7 +155,7 @@ extern "C" {
void Binary_Input_Init( void Binary_Input_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testBinaryInput( void testBinaryInput(
src/bacnet/basic/object/bi.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BINARY_INPUT DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BINARY_INPUT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/bo.c
+2 -2
View File
@@ -451,7 +451,7 @@ bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -516,4 +516,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BINARY_INPUT */ #endif /* TEST_BINARY_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/bo.h
+1 -1
View File
@@ -163,7 +163,7 @@ extern "C" {
void Binary_Output_Cleanup( void Binary_Output_Cleanup(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testBinaryOutput( void testBinaryOutput(
src/bacnet/basic/object/bo.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_BINARY_OUTPUT DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_BINARY_OUTPUT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/bv.c
+2 -2
View File
@@ -535,7 +535,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -600,4 +600,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_BINARY_VALUE */ #endif /* TEST_BINARY_VALUE */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/bv.h
+1 -1
View File
@@ -178,7 +178,7 @@ extern "C" {
void Binary_Value_Cleanup( void Binary_Value_Cleanup(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testBinary_Value( void testBinary_Value(
src/bacnet/basic/object/bv.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_BINARY_VALUE DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_BINARY_VALUE
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/channel.h
+1 -1
View File
@@ -222,7 +222,7 @@ extern "C" {
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void Channel_Init(void); void Channel_Init(void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testChannelObject(Test * pTest); void testChannelObject(Test * pTest);
src/bacnet/basic/object/command.c
+2 -2
View File
@@ -818,7 +818,7 @@ void Command_Intrinsic_Reporting(uint32_t object_instance)
{ {
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -922,4 +922,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_COMMAND */ #endif /* TEST_COMMAND */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/command.h
+1 -1
View File
@@ -188,7 +188,7 @@ extern "C" {
void Command_Init( void Command_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testCommand( void testCommand(
src/bacnet/basic/object/command.mak
+1 -1
View File
@@ -4,7 +4,7 @@ SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
HANDLER_DIR = ../handler HANDLER_DIR = ../handler
INCLUDES = -I../../include -I$(TEST_DIR) -I. -I$(HANDLER_DIR) INCLUDES = -I../../include -I$(TEST_DIR) -I. -I$(HANDLER_DIR)
DEFINES = -DBIG_ENDIAN=0 -DBACDL_ALL -DTEST -DTEST_COMMAND DEFINES = -DBIG_ENDIAN=0 -DBACDL_ALL -DBAC_TEST -DTEST_COMMAND
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/credential_data_input.c
+2 -2
View File
@@ -364,7 +364,7 @@ bool Credential_Data_Input_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -429,4 +429,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_CREDENTIAL_DATA_INPUT */ #endif /* TEST_CREDENTIAL_DATA_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/credential_data_input.h
+1 -1
View File
@@ -121,7 +121,7 @@ extern "C" {
void Credential_Data_Input_Init( void Credential_Data_Input_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testCredentialDataInput( void testCredentialDataInput(
src/bacnet/basic/object/credential_data_input.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_CREDENTIAL_DATA_INPUT DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_CREDENTIAL_DATA_INPUT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/csv.c
+2 -2
View File
@@ -552,7 +552,7 @@ bool CharacterString_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -617,4 +617,4 @@ int main(void)
return 0; return 0;
} }
#endif #endif
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/csv.h
+1 -1
View File
@@ -99,7 +99,7 @@ extern "C" {
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testCharacterStringValue( void testCharacterStringValue(
src/bacnet/basic/object/csv.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_CHARACTERSTRING_VALUE DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_CHARACTERSTRING_VALUE
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/device.c
+2 -2
View File
@@ -1920,7 +1920,7 @@ void Routing_Device_Init(uint32_t first_object_instance)
#endif /* BAC_ROUTING */ #endif /* BAC_ROUTING */
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -2011,4 +2011,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_DEVICE */ #endif /* TEST_DEVICE */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/device.mak
+1 -1
View File
@@ -5,7 +5,7 @@ TEST_DIR = ../../test
PORTS_DIR = ../../ports/linux PORTS_DIR = ../../ports/linux
INCLUDES = -I../../include -I$(TEST_DIR) -I$(PORTS_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I$(PORTS_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 DEFINES = -DBIG_ENDIAN=0
DEFINES += -DTEST -DBACDL_TEST DEFINES += -DBAC_TEST -DBACDL_TEST
DEFINES += -DBACAPP_ALL DEFINES += -DBACAPP_ALL
DEFINES += -DMAX_TSM_TRANSACTIONS=0 DEFINES += -DMAX_TSM_TRANSACTIONS=0
DEFINES += -DTEST_DEVICE DEFINES += -DTEST_DEVICE
src/bacnet/basic/object/iv.h
+1 -1
View File
@@ -131,7 +131,7 @@ extern "C" {
void Integer_Value_Init( void Integer_Value_Init(
void); void);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testInteger_Value( void testInteger_Value(
src/bacnet/basic/object/lc.c
+2 -2
View File
@@ -1004,7 +1004,7 @@ bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1416,4 +1416,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_LOAD_CONTROL */ #endif /* TEST_LOAD_CONTROL */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/lc.h
+1 -1
View File
@@ -79,7 +79,7 @@ extern "C" {
bool Load_Control_Write_Property( bool Load_Control_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testLoadControl( void testLoadControl(
src/bacnet/basic/object/lc.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LOAD_CONTROL DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_LOAD_CONTROL
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/lo.c
+2 -2
View File
@@ -1333,7 +1333,7 @@ void Lighting_Output_Init(void)
return; return;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -1398,4 +1398,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_LIGHTING_INPUT */ #endif /* TEST_LIGHTING_INPUT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/lo.h
+1 -1
View File
@@ -216,7 +216,7 @@ extern "C" {
bool Lighting_Output_Write_Property( bool Lighting_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testLightingOutput( void testLightingOutput(
src/bacnet/basic/object/lo.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LIGHTING_OUTPUT DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_LIGHTING_OUTPUT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g
src/bacnet/basic/object/lsp.c
+2 -2
View File
@@ -373,7 +373,7 @@ bool Life_Safety_Point_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
return status; return status;
} }
#ifdef TEST #ifdef BAC_TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
@@ -438,4 +438,4 @@ int main(void)
return 0; return 0;
} }
#endif /* TEST_LIFE_SAFETY_POINT */ #endif /* TEST_LIFE_SAFETY_POINT */
#endif /* TEST */ #endif /* BAC_TEST */
src/bacnet/basic/object/lsp.h
+1 -1
View File
@@ -70,7 +70,7 @@ extern "C" {
bool Life_Safety_Point_Write_Property( bool Life_Safety_Point_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
#ifdef TEST #ifdef BAC_TEST
#include "ctest.h" #include "ctest.h"
BACNET_STACK_EXPORT BACNET_STACK_EXPORT
void testLifeSafetyPoint( void testLifeSafetyPoint(
src/bacnet/basic/object/lsp.mak
+1 -1
View File
@@ -3,7 +3,7 @@ CC = gcc
SRC_DIR = ../../src SRC_DIR = ../../src
TEST_DIR = ../../test TEST_DIR = ../../test
INCLUDES = -I../../include -I$(TEST_DIR) -I. INCLUDES = -I../../include -I$(TEST_DIR) -I.
DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LIFE_SAFETY_POINT DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_LIFE_SAFETY_POINT
CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g

Some files were not shown because too many files have changed in this diff Show More