From 981d4036c8913323272068ec7453d489499590be Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Thu, 28 May 2020 15:55:05 +0200 Subject: [PATCH] refactor: rename test macro to prevent collisions (#91) * refactor: rename test macro to prevent collisions * style: align cmake epilog * refactor: rename define in makefiles --- CMakeLists.txt | 28 +++++++++---------- apps/piface/device.c | 4 +-- ports/arduino_uno/av.c | 4 +-- ports/arduino_uno/av.h | 2 +- ports/arduino_uno/bv.c | 4 +-- ports/arduino_uno/bv.h | 2 +- ports/atmega168/ai.h | 2 +- ports/atmega168/av.c | 4 +-- ports/atmega168/av.h | 2 +- ports/atmega168/bv.c | 4 +-- ports/atmega168/bv.h | 2 +- ports/esp32/src/ai.c | 4 +-- ports/esp32/src/ai.h | 2 +- ports/esp32/src/bo.c | 4 +-- ports/esp32/src/bo.h | 2 +- ports/esp32/src/device.c | 4 +-- ports/stm32f10x/automac.c | 2 +- src/bacnet/abort.c | 4 +-- src/bacnet/abort.h | 2 +- src/bacnet/alarm_ack.c | 4 +-- src/bacnet/arf.c | 4 +-- src/bacnet/arf.h | 2 +- src/bacnet/awf.c | 4 +-- src/bacnet/awf.h | 2 +- src/bacnet/bacapp.c | 4 +-- src/bacnet/bacapp.h | 4 +-- src/bacnet/bacdcode.c | 4 +-- src/bacnet/bacdcode.h | 2 +- src/bacnet/bacdevobjpropref.c | 4 +-- src/bacnet/bacdevobjpropref.h | 2 +- src/bacnet/bacerror.c | 4 +-- src/bacnet/bacerror.h | 2 +- src/bacnet/bacint.c | 4 +-- src/bacnet/bacint.h | 2 +- src/bacnet/bacpropstates.c | 4 +-- src/bacnet/bacstr.c | 4 +-- src/bacnet/bacstr.h | 2 +- src/bacnet/bactext.h | 2 +- src/bacnet/basic/bbmd6/vmac.c | 2 +- src/bacnet/basic/bbmd6/vmac.h | 2 +- src/bacnet/basic/binding/address.c | 4 +-- src/bacnet/basic/object/acc.mak | 2 +- src/bacnet/basic/object/access_credential.c | 4 +-- src/bacnet/basic/object/access_credential.h | 2 +- src/bacnet/basic/object/access_credential.mak | 2 +- src/bacnet/basic/object/access_door.c | 4 +-- src/bacnet/basic/object/access_door.h | 2 +- src/bacnet/basic/object/access_door.mak | 2 +- src/bacnet/basic/object/access_point.c | 4 +-- src/bacnet/basic/object/access_point.h | 2 +- src/bacnet/basic/object/access_point.mak | 2 +- src/bacnet/basic/object/access_rights.c | 4 +-- src/bacnet/basic/object/access_rights.h | 2 +- src/bacnet/basic/object/access_rights.mak | 2 +- src/bacnet/basic/object/access_user.c | 4 +-- src/bacnet/basic/object/access_user.h | 2 +- src/bacnet/basic/object/access_user.mak | 2 +- src/bacnet/basic/object/access_zone.c | 4 +-- src/bacnet/basic/object/access_zone.h | 2 +- src/bacnet/basic/object/access_zone.mak | 2 +- src/bacnet/basic/object/ai.c | 4 +-- src/bacnet/basic/object/ai.h | 2 +- src/bacnet/basic/object/ai.mak | 2 +- src/bacnet/basic/object/ao.c | 4 +-- src/bacnet/basic/object/ao.h | 2 +- src/bacnet/basic/object/ao.mak | 2 +- src/bacnet/basic/object/av.c | 4 +-- src/bacnet/basic/object/av.h | 2 +- src/bacnet/basic/object/av.mak | 2 +- src/bacnet/basic/object/bi.c | 4 +-- src/bacnet/basic/object/bi.h | 2 +- src/bacnet/basic/object/bi.mak | 2 +- src/bacnet/basic/object/bo.c | 4 +-- src/bacnet/basic/object/bo.h | 2 +- src/bacnet/basic/object/bo.mak | 2 +- src/bacnet/basic/object/bv.c | 4 +-- src/bacnet/basic/object/bv.h | 2 +- src/bacnet/basic/object/bv.mak | 2 +- src/bacnet/basic/object/channel.h | 2 +- src/bacnet/basic/object/command.c | 4 +-- src/bacnet/basic/object/command.h | 2 +- src/bacnet/basic/object/command.mak | 2 +- .../basic/object/credential_data_input.c | 4 +-- .../basic/object/credential_data_input.h | 2 +- .../basic/object/credential_data_input.mak | 2 +- src/bacnet/basic/object/csv.c | 4 +-- src/bacnet/basic/object/csv.h | 2 +- src/bacnet/basic/object/csv.mak | 2 +- src/bacnet/basic/object/device.c | 4 +-- src/bacnet/basic/object/device.mak | 2 +- src/bacnet/basic/object/iv.h | 2 +- src/bacnet/basic/object/lc.c | 4 +-- src/bacnet/basic/object/lc.h | 2 +- src/bacnet/basic/object/lc.mak | 2 +- src/bacnet/basic/object/lo.c | 4 +-- src/bacnet/basic/object/lo.h | 2 +- src/bacnet/basic/object/lo.mak | 2 +- src/bacnet/basic/object/lsp.c | 4 +-- src/bacnet/basic/object/lsp.h | 2 +- src/bacnet/basic/object/lsp.mak | 2 +- src/bacnet/basic/object/ms-input.c | 4 +-- src/bacnet/basic/object/ms-input.h | 2 +- src/bacnet/basic/object/ms-input.mak | 2 +- src/bacnet/basic/object/mso.c | 4 +-- src/bacnet/basic/object/mso.h | 2 +- src/bacnet/basic/object/mso.mak | 2 +- src/bacnet/basic/object/msv.c | 4 +-- src/bacnet/basic/object/msv.h | 2 +- src/bacnet/basic/object/msv.mak | 2 +- src/bacnet/basic/object/netport.c | 2 +- src/bacnet/basic/object/osv.c | 4 +-- src/bacnet/basic/object/osv.h | 2 +- src/bacnet/basic/object/osv.mak | 2 +- src/bacnet/basic/object/piv.c | 4 +-- src/bacnet/basic/object/piv.h | 2 +- src/bacnet/basic/object/piv.mak | 2 +- src/bacnet/basic/object/schedule.c | 4 +-- src/bacnet/basic/object/schedule.mak | 2 +- src/bacnet/basic/sys/fifo.c | 2 +- src/bacnet/basic/sys/fifo.h | 2 +- src/bacnet/basic/sys/filename.c | 4 +-- src/bacnet/basic/sys/key.c | 4 +-- src/bacnet/basic/sys/keylist.c | 4 +-- src/bacnet/basic/sys/keylist.h | 2 +- src/bacnet/basic/sys/ringbuf.c | 2 +- src/bacnet/basic/sys/ringbuf.h | 2 +- src/bacnet/basic/sys/sbuf.c | 4 +-- src/bacnet/basic/tsm/tsm.c | 4 +-- src/bacnet/config.h | 2 +- src/bacnet/cov.c | 4 +-- src/bacnet/cov.h | 2 +- src/bacnet/datalink/bvlc.c | 4 +-- src/bacnet/datalink/bvlc.h | 2 +- src/bacnet/datalink/bvlc6.c | 4 +-- src/bacnet/datalink/bvlc6.h | 2 +- src/bacnet/datalink/crc.c | 2 +- src/bacnet/datalink/mstp.c | 2 +- src/bacnet/datetime.c | 4 +-- src/bacnet/datetime.h | 2 +- src/bacnet/dcc.c | 4 +-- src/bacnet/dcc.h | 2 +- src/bacnet/event.c | 4 +-- src/bacnet/getevent.c | 4 +-- src/bacnet/getevent.h | 2 +- src/bacnet/iam.c | 4 +-- src/bacnet/iam.h | 2 +- src/bacnet/ihave.c | 4 +-- src/bacnet/ihave.h | 2 +- src/bacnet/indtext.c | 2 +- src/bacnet/indtext.h | 2 +- src/bacnet/lighting.c | 4 +-- src/bacnet/lso.c | 4 +-- src/bacnet/lso.h | 2 +- src/bacnet/memcopy.c | 4 +-- src/bacnet/npdu.c | 4 +-- src/bacnet/property.c | 4 +-- src/bacnet/ptransfer.c | 4 +-- src/bacnet/ptransfer.h | 2 +- src/bacnet/rd.c | 4 +-- src/bacnet/rd.h | 2 +- src/bacnet/reject.c | 4 +-- src/bacnet/reject.h | 2 +- src/bacnet/rp.c | 4 +-- src/bacnet/rp.h | 2 +- src/bacnet/rpm.c | 4 +-- src/bacnet/rpm.h | 2 +- src/bacnet/timestamp.c | 4 +-- src/bacnet/timesync.c | 4 +-- src/bacnet/timesync.h | 2 +- src/bacnet/whohas.c | 4 +-- src/bacnet/whohas.h | 2 +- src/bacnet/whois.c | 4 +-- src/bacnet/whois.h | 2 +- src/bacnet/wp.c | 4 +-- src/bacnet/wp.h | 2 +- test/abort.mak | 2 +- test/address.mak | 2 +- test/arf.mak | 2 +- test/awf.mak | 2 +- test/bacapp.mak | 2 +- test/bacdcode.mak | 2 +- test/bacdevobjpropref.mak | 2 +- test/bacerror.mak | 2 +- test/bacint.mak | 2 +- test/bacstr.mak | 2 +- test/bbmd6.mak | 2 +- test/bvlc.mak | 2 +- test/bvlc6.mak | 2 +- test/cov.mak | 2 +- test/crc.mak | 2 +- test/datetime.mak | 2 +- test/dcc.mak | 2 +- test/event.mak | 2 +- test/fifo.mak | 2 +- test/filename.mak | 2 +- test/getevent.mak | 2 +- test/iam.mak | 2 +- test/ihave.mak | 2 +- test/indtext.mak | 2 +- test/key.mak | 2 +- test/keylist.mak | 2 +- test/lighting.mak | 2 +- test/lso.mak | 2 +- test/memcopy.mak | 2 +- test/mstp.mak | 2 +- test/npdu.mak | 2 +- test/proplist.mak | 2 +- test/ptransfer.mak | 2 +- test/rd.mak | 2 +- test/reject.mak | 2 +- test/ringbuf.mak | 2 +- test/rp.mak | 2 +- test/rpm.mak | 2 +- test/sbuf.mak | 2 +- test/timer.mak | 2 +- test/timesync.mak | 2 +- test/vmac.mak | 2 +- test/whohas.mak | 2 +- test/whois.mak | 2 +- test/wp.mak | 2 +- 220 files changed, 308 insertions(+), 308 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59cc3682..10c97f60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,20 +61,6 @@ option( 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 # @@ -707,3 +693,17 @@ install( COMPONENT dev FILES_MATCHING 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}\"") diff --git a/apps/piface/device.c b/apps/piface/device.c index c43fd039..32361f8f 100644 --- a/apps/piface/device.c +++ b/apps/piface/device.c @@ -1586,7 +1586,7 @@ void Routing_Device_Init(uint32_t first_object_instance) #endif /* BAC_ROUTING */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1677,4 +1677,4 @@ int main(void) return 0; } #endif /* TEST_DEVICE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/arduino_uno/av.c b/ports/arduino_uno/av.c index 14704df1..77607880 100644 --- a/ports/arduino_uno/av.c +++ b/ports/arduino_uno/av.c @@ -198,7 +198,7 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data, return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -246,4 +246,4 @@ int main(void) return 0; } #endif /* TEST_ANALOG_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/arduino_uno/av.h b/ports/arduino_uno/av.h index a1b7c3b4..2b4f2eff 100644 --- a/ports/arduino_uno/av.h +++ b/ports/arduino_uno/av.h @@ -64,7 +64,7 @@ extern "C" { void Analog_Value_Init(void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" void testAnalog_Value(Test * pTest); #endif diff --git a/ports/arduino_uno/bv.c b/ports/arduino_uno/bv.c index 3cb0cc65..0d9189bf 100644 --- a/ports/arduino_uno/bv.c +++ b/ports/arduino_uno/bv.c @@ -245,7 +245,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data, return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -293,4 +293,4 @@ int main(void) return 0; } #endif /* TEST_BINARY_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/arduino_uno/bv.h b/ports/arduino_uno/bv.h index 1bb14852..090612bb 100644 --- a/ports/arduino_uno/bv.h +++ b/ports/arduino_uno/bv.h @@ -61,7 +61,7 @@ extern "C" { BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" void testBinary_Value(Test * pTest); #endif diff --git a/ports/atmega168/ai.h b/ports/atmega168/ai.h index 83a6110a..6f6d5f19 100644 --- a/ports/atmega168/ai.h +++ b/ports/atmega168/ai.h @@ -82,7 +82,7 @@ extern "C" { void Analog_Input_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" void testAnalogInput( Test * pTest); diff --git a/ports/atmega168/av.c b/ports/atmega168/av.c index 88a60ffb..ac2396d1 100644 --- a/ports/atmega168/av.c +++ b/ports/atmega168/av.c @@ -217,7 +217,7 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -265,4 +265,4 @@ int main(void) return 0; } #endif /* TEST_ANALOG_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/atmega168/av.h b/ports/atmega168/av.h index 68aae2b2..3aabf0bf 100644 --- a/ports/atmega168/av.h +++ b/ports/atmega168/av.h @@ -74,7 +74,7 @@ extern "C" { void Analog_Value_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" void testAnalog_Value( Test * pTest); diff --git a/ports/atmega168/bv.c b/ports/atmega168/bv.c index 1e49f35d..88c4ae6d 100644 --- a/ports/atmega168/bv.c +++ b/ports/atmega168/bv.c @@ -261,7 +261,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -309,4 +309,4 @@ int main(void) return 0; } #endif /* TEST_BINARY_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/atmega168/bv.h b/ports/atmega168/bv.h index ae4c5a50..2107ac1e 100644 --- a/ports/atmega168/bv.h +++ b/ports/atmega168/bv.h @@ -69,7 +69,7 @@ extern "C" { BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" void testBinary_Value( Test * pTest); diff --git a/ports/esp32/src/ai.c b/ports/esp32/src/ai.c index 36c5e99c..806abb93 100644 --- a/ports/esp32/src/ai.c +++ b/ports/esp32/src/ai.c @@ -1325,7 +1325,7 @@ int Analog_Input_Alarm_Summary( } #endif /* defined(INTRINSIC_REPORTING) */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1398,4 +1398,4 @@ int main(void) return 0; } #endif /* TEST_ANALOG_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/esp32/src/ai.h b/ports/esp32/src/ai.h index 511312d8..63e9e074 100644 --- a/ports/esp32/src/ai.h +++ b/ports/esp32/src/ai.h @@ -162,7 +162,7 @@ extern "C" { void Analog_Input_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" void testAnalogInput( Test * pTest); diff --git a/ports/esp32/src/bo.c b/ports/esp32/src/bo.c index ece479e5..155fc9ae 100644 --- a/ports/esp32/src/bo.c +++ b/ports/esp32/src/bo.c @@ -449,7 +449,7 @@ bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -514,4 +514,4 @@ int main(void) return 0; } #endif /* TEST_BINARY_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/esp32/src/bo.h b/ports/esp32/src/bo.h index 6b9b58c0..83115acf 100644 --- a/ports/esp32/src/bo.h +++ b/ports/esp32/src/bo.h @@ -129,7 +129,7 @@ extern "C" { void Binary_Output_Cleanup( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" void testBinaryOutput( Test * pTest); diff --git a/ports/esp32/src/device.c b/ports/esp32/src/device.c index 1d97263b..e76bb765 100644 --- a/ports/esp32/src/device.c +++ b/ports/esp32/src/device.c @@ -1782,7 +1782,7 @@ void Routing_Device_Init(uint32_t first_object_instance) #endif /* BAC_ROUTING */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1873,4 +1873,4 @@ int main(void) return 0; } #endif /* TEST_DEVICE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/ports/stm32f10x/automac.c b/ports/stm32f10x/automac.c index 02ed0212..b1aba26b 100644 --- a/ports/stm32f10x/automac.c +++ b/ports/stm32f10x/automac.c @@ -322,7 +322,7 @@ void automac_init(void) PFM_Cycle_Complete = false; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include diff --git a/src/bacnet/abort.c b/src/bacnet/abort.c index a9736b9f..68337733 100644 --- a/src/bacnet/abort.c +++ b/src/bacnet/abort.c @@ -199,7 +199,7 @@ int abort_decode_service_request( } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -347,4 +347,4 @@ int main(void) return 0; } #endif /* TEST_ABORT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/abort.h b/src/bacnet/abort.h index c738bd59..a7550d07 100644 --- a/src/bacnet/abort.h +++ b/src/bacnet/abort.h @@ -54,7 +54,7 @@ extern "C" { uint8_t * invoke_id, uint8_t * abort_reason); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAbort( diff --git a/src/bacnet/alarm_ack.c b/src/bacnet/alarm_ack.c index c5179379..bf76a8ca 100644 --- a/src/bacnet/alarm_ack.c +++ b/src/bacnet/alarm_ack.c @@ -174,7 +174,7 @@ int alarm_ack_decode_service_request( return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include @@ -270,4 +270,4 @@ int main(void) } #endif /* TEST_ALARM_ACK */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/arf.c b/src/bacnet/arf.c index 1ac1d066..ccf1c5b0 100644 --- a/src/bacnet/arf.c +++ b/src/bacnet/arf.c @@ -378,7 +378,7 @@ int arf_ack_decode_apdu(uint8_t *apdu, return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -566,4 +566,4 @@ int main(void) return 0; } #endif /* TEST_xxx */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/arf.h b/src/bacnet/arf.h index 633acfc6..d9d42ac4 100644 --- a/src/bacnet/arf.h +++ b/src/bacnet/arf.h @@ -103,7 +103,7 @@ extern "C" { uint8_t * invoke_id, BACNET_ATOMIC_READ_FILE_DATA * data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT diff --git a/src/bacnet/awf.c b/src/bacnet/awf.c index 9cb908d1..2829165b 100644 --- a/src/bacnet/awf.c +++ b/src/bacnet/awf.c @@ -312,7 +312,7 @@ int awf_ack_decode_apdu(uint8_t *apdu, return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -487,4 +487,4 @@ int main(void) return 0; } #endif /* TEST_WRITE_PROPERTY */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/awf.h b/src/bacnet/awf.h index d2d83de6..b2a10cf1 100644 --- a/src/bacnet/awf.h +++ b/src/bacnet/awf.h @@ -97,7 +97,7 @@ extern "C" { uint8_t * invoke_id, BACNET_ATOMIC_WRITE_FILE_DATA * data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT diff --git a/src/bacnet/bacapp.c b/src/bacnet/bacapp.c index b9731750..d353c4d0 100644 --- a/src/bacnet/bacapp.c +++ b/src/bacnet/bacapp.c @@ -1560,7 +1560,7 @@ void bacapp_property_value_list_init(BACNET_PROPERTY_VALUE *value, size_t count) } } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -2189,4 +2189,4 @@ int main(void) return 0; } #endif /* TEST_BACNET_APPLICATION_DATA */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/bacapp.h b/src/bacnet/bacapp.h index 062629bb..0fbcc080 100644 --- a/src/bacnet/bacapp.h +++ b/src/bacnet/bacapp.h @@ -229,7 +229,7 @@ extern "C" { BACNET_PROPERTY_ID property); #ifndef BACAPP_PRINT_ENABLED -#if PRINT_ENABLED || defined TEST +#if PRINT_ENABLED || defined BAC_TEST #define BACAPP_PRINT_ENABLED #define BACAPP_SNPRINTF_ENABLED #endif @@ -259,7 +259,7 @@ extern "C" { #define bacapp_print_value(x,y) false #endif -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" #include "bacnet/datetime.h" BACNET_STACK_EXPORT diff --git a/src/bacnet/bacdcode.c b/src/bacnet/bacdcode.c index e8646f79..ddcfb6a2 100644 --- a/src/bacnet/bacdcode.c +++ b/src/bacnet/bacdcode.c @@ -2532,7 +2532,7 @@ int decode_context_bacnet_address( } /* end of decoding_encoding.c */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include @@ -3837,4 +3837,4 @@ int main(void) return 0; } #endif /* TEST_DECODE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/bacdcode.h b/src/bacnet/bacdcode.h index 0091f098..24769cc1 100644 --- a/src/bacnet/bacdcode.h +++ b/src/bacnet/bacdcode.h @@ -629,7 +629,7 @@ extern "C" { /* true if the tag is a closing tag */ #define IS_CLOSING_TAG(x) ((x & 0x07) == 7) -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void test_BACDCode( diff --git a/src/bacnet/bacdevobjpropref.c b/src/bacnet/bacdevobjpropref.c index cb422665..cf2b5b87 100644 --- a/src/bacnet/bacdevobjpropref.c +++ b/src/bacnet/bacdevobjpropref.c @@ -305,7 +305,7 @@ int bacapp_decode_context_device_obj_ref( return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -433,4 +433,4 @@ int main(void) } #endif /* TEST_DEV_ID_PROP_REF */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/bacdevobjpropref.h b/src/bacnet/bacdevobjpropref.h index 0620fc89..954c4176 100644 --- a/src/bacnet/bacdevobjpropref.h +++ b/src/bacnet/bacdevobjpropref.h @@ -100,7 +100,7 @@ extern "C" { uint8_t tag_number, BACNET_DEVICE_OBJECT_REFERENCE * value); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testBACnetDeviceObjectPropertyReference( diff --git a/src/bacnet/bacerror.c b/src/bacnet/bacerror.c index 0f70868c..896eaa78 100644 --- a/src/bacnet/bacerror.c +++ b/src/bacnet/bacerror.c @@ -125,7 +125,7 @@ int bacerror_decode_service_request(uint8_t *apdu, } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -255,4 +255,4 @@ int main(void) return 0; } #endif /* TEST_ERROR */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/bacerror.h b/src/bacnet/bacerror.h index ac4fa158..9bd6342d 100644 --- a/src/bacnet/bacerror.h +++ b/src/bacnet/bacerror.h @@ -57,7 +57,7 @@ extern "C" { BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int bacerror_decode_apdu( diff --git a/src/bacnet/bacint.c b/src/bacnet/bacint.c index ebb5df06..e20b30ea 100644 --- a/src/bacnet/bacint.c +++ b/src/bacnet/bacint.c @@ -413,7 +413,7 @@ int decode_signed32(uint8_t *apdu, int32_t *value) } #endif /* end of decoding_encoding.c */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include @@ -651,4 +651,4 @@ int main(void) return 0; } #endif /* TEST_BACINT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/bacint.h b/src/bacnet/bacint.h index 89f5883e..281070c6 100644 --- a/src/bacnet/bacint.h +++ b/src/bacnet/bacint.h @@ -137,7 +137,7 @@ extern "C" { uint8_t * apdu, int32_t * value); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testBACnetIntegers( diff --git a/src/bacnet/bacpropstates.c b/src/bacnet/bacpropstates.c index 6802ddcd..e8088d0f 100644 --- a/src/bacnet/bacpropstates.c +++ b/src/bacnet/bacpropstates.c @@ -293,7 +293,7 @@ int bacapp_encode_property_state(uint8_t *apdu, BACNET_PROPERTY_STATE *value) return len; } -#ifdef TEST +#ifdef BAC_TEST #include /* for memset */ void testPropStates(Test *pTest) @@ -419,4 +419,4 @@ int main(void) } #endif /* TEST_PROP_STATES */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/bacstr.c b/src/bacnet/bacstr.c index c1b0e66e..fb8c8509 100644 --- a/src/bacnet/bacstr.c +++ b/src/bacnet/bacstr.c @@ -918,7 +918,7 @@ bool octetstring_value_same( } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include @@ -1129,4 +1129,4 @@ int main(void) return 0; } #endif /* TEST_BACSTR */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/bacstr.h b/src/bacnet/bacstr.h index cbb1bae3..7a5de136 100644 --- a/src/bacnet/bacstr.h +++ b/src/bacnet/bacstr.h @@ -237,7 +237,7 @@ extern "C" { BACNET_OCTET_STRING * octet_string1, BACNET_OCTET_STRING * octet_string2); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testBACnetStrings( diff --git a/src/bacnet/bactext.h b/src/bacnet/bactext.h index a06bae2d..fd1991fb 100644 --- a/src/bacnet/bactext.h +++ b/src/bacnet/bactext.h @@ -28,7 +28,7 @@ #if PRINT_ENABLED #define BACTEXT_PRINT_ENABLED #else -#ifdef TEST +#ifdef BAC_TEST #define BACTEXT_PRINT_ENABLED #endif #endif diff --git a/src/bacnet/basic/bbmd6/vmac.c b/src/bacnet/basic/bbmd6/vmac.c index c855a545..e67a20e2 100644 --- a/src/bacnet/basic/bbmd6/vmac.c +++ b/src/bacnet/basic/bbmd6/vmac.c @@ -259,7 +259,7 @@ void VMAC_Init(void) } } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" diff --git a/src/bacnet/basic/bbmd6/vmac.h b/src/bacnet/basic/bbmd6/vmac.h index fb242fc1..c206d931 100644 --- a/src/bacnet/basic/bbmd6/vmac.h +++ b/src/bacnet/basic/bbmd6/vmac.h @@ -50,7 +50,7 @@ extern "C" { BACNET_STACK_EXPORT void VMAC_Init(void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testVMAC( diff --git a/src/bacnet/basic/binding/address.c b/src/bacnet/basic/binding/address.c index e87c9d80..fd378987 100644 --- a/src/bacnet/basic/binding/address.c +++ b/src/bacnet/basic/binding/address.c @@ -1139,7 +1139,7 @@ void address_cache_timer(uint16_t uSeconds) } } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1312,4 +1312,4 @@ int main(void) return 0; } #endif /* TEST_ADDRESS */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/acc.mak b/src/bacnet/basic/object/acc.mak index 6cf1bd59..4b96135d 100644 --- a/src/bacnet/basic/object/acc.mak +++ b/src/bacnet/basic/object/acc.mak @@ -4,7 +4,7 @@ SRC_DIR = ../../src TEST_DIR = ../../test HANDLER_DIR = ../handler 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 diff --git a/src/bacnet/basic/object/access_credential.c b/src/bacnet/basic/object/access_credential.c index 5e8fb8d7..2fd7d17e 100644 --- a/src/bacnet/basic/object/access_credential.c +++ b/src/bacnet/basic/object/access_credential.c @@ -374,7 +374,7 @@ bool Access_Credential_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -439,4 +439,4 @@ int main(void) return 0; } #endif /* TEST_ACCESS_CREDENTIAL */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/access_credential.h b/src/bacnet/basic/object/access_credential.h index 96bbb5b4..768487d0 100644 --- a/src/bacnet/basic/object/access_credential.h +++ b/src/bacnet/basic/object/access_credential.h @@ -127,7 +127,7 @@ extern "C" { void Access_Credential_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAccessCredential( diff --git a/src/bacnet/basic/object/access_credential.mak b/src/bacnet/basic/object/access_credential.mak index a1e852dd..71360277 100644 --- a/src/bacnet/basic/object/access_credential.mak +++ b/src/bacnet/basic/object/access_credential.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/access_door.c b/src/bacnet/basic/object/access_door.c index f79e7148..9cd550bc 100644 --- a/src/bacnet/basic/object/access_door.c +++ b/src/bacnet/basic/object/access_door.c @@ -566,7 +566,7 @@ bool Access_Door_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -631,4 +631,4 @@ int main(void) return 0; } #endif /* TEST_ACCESS_DOOR */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/access_door.h b/src/bacnet/basic/object/access_door.h index 8c223a71..d7dd2d9c 100644 --- a/src/bacnet/basic/object/access_door.h +++ b/src/bacnet/basic/object/access_door.h @@ -159,7 +159,7 @@ extern "C" { void Access_Door_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAccessDoor( diff --git a/src/bacnet/basic/object/access_door.mak b/src/bacnet/basic/object/access_door.mak index eaf59450..07abb603 100644 --- a/src/bacnet/basic/object/access_door.mak +++ b/src/bacnet/basic/object/access_door.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/access_point.c b/src/bacnet/basic/object/access_point.c index 1925c22f..d6b5c658 100644 --- a/src/bacnet/basic/object/access_point.c +++ b/src/bacnet/basic/object/access_point.c @@ -363,7 +363,7 @@ bool Access_Point_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -428,4 +428,4 @@ int main(void) return 0; } #endif /* TEST_ACCESS_POINT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/access_point.h b/src/bacnet/basic/object/access_point.h index 2f92710e..3c920b6f 100644 --- a/src/bacnet/basic/object/access_point.h +++ b/src/bacnet/basic/object/access_point.h @@ -124,7 +124,7 @@ extern "C" { void Access_Point_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAccessPoint( diff --git a/src/bacnet/basic/object/access_point.mak b/src/bacnet/basic/object/access_point.mak index 93f7de12..11ac51ce 100644 --- a/src/bacnet/basic/object/access_point.mak +++ b/src/bacnet/basic/object/access_point.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/access_rights.c b/src/bacnet/basic/object/access_rights.c index 31aee68d..0af9201f 100644 --- a/src/bacnet/basic/object/access_rights.c +++ b/src/bacnet/basic/object/access_rights.c @@ -336,7 +336,7 @@ bool Access_Rights_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -401,4 +401,4 @@ int main(void) return 0; } #endif /* TEST_ACCESS_RIGHTS */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/access_rights.h b/src/bacnet/basic/object/access_rights.h index 496eae30..a8a61918 100644 --- a/src/bacnet/basic/object/access_rights.h +++ b/src/bacnet/basic/object/access_rights.h @@ -112,7 +112,7 @@ extern "C" { void Access_Rights_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAccessRights( diff --git a/src/bacnet/basic/object/access_rights.mak b/src/bacnet/basic/object/access_rights.mak index 85ed1bfa..4c7202d5 100644 --- a/src/bacnet/basic/object/access_rights.mak +++ b/src/bacnet/basic/object/access_rights.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/access_user.c b/src/bacnet/basic/object/access_user.c index 8d44b3bd..e8488fc5 100644 --- a/src/bacnet/basic/object/access_user.c +++ b/src/bacnet/basic/object/access_user.c @@ -278,7 +278,7 @@ bool Access_User_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -343,4 +343,4 @@ int main(void) return 0; } #endif /* TEST_ACCESS_USER */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/access_user.h b/src/bacnet/basic/object/access_user.h index 8243e80d..8278a2a8 100644 --- a/src/bacnet/basic/object/access_user.h +++ b/src/bacnet/basic/object/access_user.h @@ -105,7 +105,7 @@ extern "C" { void Access_User_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAccessUser( diff --git a/src/bacnet/basic/object/access_user.mak b/src/bacnet/basic/object/access_user.mak index 2864f6f5..fabbd4a3 100644 --- a/src/bacnet/basic/object/access_user.mak +++ b/src/bacnet/basic/object/access_user.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/access_zone.c b/src/bacnet/basic/object/access_zone.c index 9d4036bd..ed11a6f2 100644 --- a/src/bacnet/basic/object/access_zone.c +++ b/src/bacnet/basic/object/access_zone.c @@ -344,7 +344,7 @@ bool Access_Zone_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -409,4 +409,4 @@ int main(void) return 0; } #endif /* TEST_ACCESS_ZONE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/access_zone.h b/src/bacnet/basic/object/access_zone.h index bd1d6325..447fdbba 100644 --- a/src/bacnet/basic/object/access_zone.h +++ b/src/bacnet/basic/object/access_zone.h @@ -121,7 +121,7 @@ extern "C" { void Access_Zone_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAccessZone( diff --git a/src/bacnet/basic/object/access_zone.mak b/src/bacnet/basic/object/access_zone.mak index a99a01bb..54f8dd2a 100644 --- a/src/bacnet/basic/object/access_zone.mak +++ b/src/bacnet/basic/object/access_zone.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/ai.c b/src/bacnet/basic/object/ai.c index 93ff2e01..0c7d114d 100644 --- a/src/bacnet/basic/object/ai.c +++ b/src/bacnet/basic/object/ai.c @@ -1329,7 +1329,7 @@ int Analog_Input_Alarm_Summary( } #endif /* defined(INTRINSIC_REPORTING) */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1402,4 +1402,4 @@ int main(void) return 0; } #endif /* TEST_ANALOG_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/ai.h b/src/bacnet/basic/object/ai.h index e6a4d01a..91867785 100644 --- a/src/bacnet/basic/object/ai.h +++ b/src/bacnet/basic/object/ai.h @@ -193,7 +193,7 @@ extern "C" { void Analog_Input_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAnalogInput( diff --git a/src/bacnet/basic/object/ai.mak b/src/bacnet/basic/object/ai.mak index 7f15b7a2..11910389 100644 --- a/src/bacnet/basic/object/ai.mak +++ b/src/bacnet/basic/object/ai.mak @@ -4,7 +4,7 @@ SRC_DIR = ../../src TEST_DIR = ../../test HANDLER_DIR = ../handler 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 diff --git a/src/bacnet/basic/object/ao.c b/src/bacnet/basic/object/ao.c index 0dd94a90..6c03f35a 100644 --- a/src/bacnet/basic/object/ao.c +++ b/src/bacnet/basic/object/ao.c @@ -482,7 +482,7 @@ bool Analog_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -555,4 +555,4 @@ int main(void) return 0; } #endif /* TEST_ANALOG_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/ao.h b/src/bacnet/basic/object/ao.h index 777fa00b..0e0d8d45 100644 --- a/src/bacnet/basic/object/ao.h +++ b/src/bacnet/basic/object/ao.h @@ -161,7 +161,7 @@ extern "C" { void Analog_Output_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAnalogOutput( diff --git a/src/bacnet/basic/object/ao.mak b/src/bacnet/basic/object/ao.mak index f75731e4..1c4de525 100644 --- a/src/bacnet/basic/object/ao.mak +++ b/src/bacnet/basic/object/ao.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/av.c b/src/bacnet/basic/object/av.c index 1df5418d..9e7b697b 100644 --- a/src/bacnet/basic/object/av.c +++ b/src/bacnet/basic/object/av.c @@ -1427,7 +1427,7 @@ int Analog_Value_Alarm_Summary( } #endif /* defined(INTRINSIC_REPORTING) */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1492,4 +1492,4 @@ int main(void) return 0; } #endif /* TEST_ANALOG_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/av.h b/src/bacnet/basic/object/av.h index 95a7b910..ce11b487 100644 --- a/src/bacnet/basic/object/av.h +++ b/src/bacnet/basic/object/av.h @@ -201,7 +201,7 @@ extern "C" { void Analog_Value_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testAnalog_Value( diff --git a/src/bacnet/basic/object/av.mak b/src/bacnet/basic/object/av.mak index a3c3285c..d2be166a 100644 --- a/src/bacnet/basic/object/av.mak +++ b/src/bacnet/basic/object/av.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/bi.c b/src/bacnet/basic/object/bi.c index 74332d4c..d90eab89 100644 --- a/src/bacnet/basic/object/bi.c +++ b/src/bacnet/basic/object/bi.c @@ -484,7 +484,7 @@ bool Binary_Input_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -549,4 +549,4 @@ int main(void) return 0; } #endif /* TEST_BINARY_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/bi.h b/src/bacnet/basic/object/bi.h index 23bfd94b..423de741 100644 --- a/src/bacnet/basic/object/bi.h +++ b/src/bacnet/basic/object/bi.h @@ -155,7 +155,7 @@ extern "C" { void Binary_Input_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testBinaryInput( diff --git a/src/bacnet/basic/object/bi.mak b/src/bacnet/basic/object/bi.mak index 75c1622e..677a736c 100644 --- a/src/bacnet/basic/object/bi.mak +++ b/src/bacnet/basic/object/bi.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/bo.c b/src/bacnet/basic/object/bo.c index 36988785..1c19c3f4 100644 --- a/src/bacnet/basic/object/bo.c +++ b/src/bacnet/basic/object/bo.c @@ -451,7 +451,7 @@ bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -516,4 +516,4 @@ int main(void) return 0; } #endif /* TEST_BINARY_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/bo.h b/src/bacnet/basic/object/bo.h index c5a70a51..cf960afd 100644 --- a/src/bacnet/basic/object/bo.h +++ b/src/bacnet/basic/object/bo.h @@ -163,7 +163,7 @@ extern "C" { void Binary_Output_Cleanup( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testBinaryOutput( diff --git a/src/bacnet/basic/object/bo.mak b/src/bacnet/basic/object/bo.mak index 0d64492a..b3ecf077 100644 --- a/src/bacnet/basic/object/bo.mak +++ b/src/bacnet/basic/object/bo.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/bv.c b/src/bacnet/basic/object/bv.c index 90fbf5c8..d5f38699 100644 --- a/src/bacnet/basic/object/bv.c +++ b/src/bacnet/basic/object/bv.c @@ -535,7 +535,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -600,4 +600,4 @@ int main(void) return 0; } #endif /* TEST_BINARY_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/bv.h b/src/bacnet/basic/object/bv.h index 50ab3f46..06687c53 100644 --- a/src/bacnet/basic/object/bv.h +++ b/src/bacnet/basic/object/bv.h @@ -178,7 +178,7 @@ extern "C" { void Binary_Value_Cleanup( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testBinary_Value( diff --git a/src/bacnet/basic/object/bv.mak b/src/bacnet/basic/object/bv.mak index 75a3af0b..c51c3151 100644 --- a/src/bacnet/basic/object/bv.mak +++ b/src/bacnet/basic/object/bv.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/channel.h b/src/bacnet/basic/object/channel.h index 2ee0bf4b..61c5b837 100644 --- a/src/bacnet/basic/object/channel.h +++ b/src/bacnet/basic/object/channel.h @@ -222,7 +222,7 @@ extern "C" { BACNET_STACK_EXPORT void Channel_Init(void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testChannelObject(Test * pTest); diff --git a/src/bacnet/basic/object/command.c b/src/bacnet/basic/object/command.c index 3e6f433a..ccc91724 100644 --- a/src/bacnet/basic/object/command.c +++ b/src/bacnet/basic/object/command.c @@ -818,7 +818,7 @@ void Command_Intrinsic_Reporting(uint32_t object_instance) { } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -922,4 +922,4 @@ int main(void) return 0; } #endif /* TEST_COMMAND */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/command.h b/src/bacnet/basic/object/command.h index 273da6d6..ddc7836f 100644 --- a/src/bacnet/basic/object/command.h +++ b/src/bacnet/basic/object/command.h @@ -188,7 +188,7 @@ extern "C" { void Command_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testCommand( diff --git a/src/bacnet/basic/object/command.mak b/src/bacnet/basic/object/command.mak index ffe247cb..730ce385 100644 --- a/src/bacnet/basic/object/command.mak +++ b/src/bacnet/basic/object/command.mak @@ -4,7 +4,7 @@ SRC_DIR = ../../src TEST_DIR = ../../test HANDLER_DIR = ../handler 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 diff --git a/src/bacnet/basic/object/credential_data_input.c b/src/bacnet/basic/object/credential_data_input.c index f141f222..85106762 100644 --- a/src/bacnet/basic/object/credential_data_input.c +++ b/src/bacnet/basic/object/credential_data_input.c @@ -364,7 +364,7 @@ bool Credential_Data_Input_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -429,4 +429,4 @@ int main(void) return 0; } #endif /* TEST_CREDENTIAL_DATA_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/credential_data_input.h b/src/bacnet/basic/object/credential_data_input.h index 8b33385a..cfc5fdcb 100644 --- a/src/bacnet/basic/object/credential_data_input.h +++ b/src/bacnet/basic/object/credential_data_input.h @@ -121,7 +121,7 @@ extern "C" { void Credential_Data_Input_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testCredentialDataInput( diff --git a/src/bacnet/basic/object/credential_data_input.mak b/src/bacnet/basic/object/credential_data_input.mak index 0fa867a4..f951815d 100644 --- a/src/bacnet/basic/object/credential_data_input.mak +++ b/src/bacnet/basic/object/credential_data_input.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/csv.c b/src/bacnet/basic/object/csv.c index 02c6a71b..66bfd017 100644 --- a/src/bacnet/basic/object/csv.c +++ b/src/bacnet/basic/object/csv.c @@ -552,7 +552,7 @@ bool CharacterString_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -617,4 +617,4 @@ int main(void) return 0; } #endif -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/csv.h b/src/bacnet/basic/object/csv.h index 79e8622e..660ba7c9 100644 --- a/src/bacnet/basic/object/csv.h +++ b/src/bacnet/basic/object/csv.h @@ -99,7 +99,7 @@ extern "C" { void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testCharacterStringValue( diff --git a/src/bacnet/basic/object/csv.mak b/src/bacnet/basic/object/csv.mak index 600ea471..f0cd5459 100644 --- a/src/bacnet/basic/object/csv.mak +++ b/src/bacnet/basic/object/csv.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/device.c b/src/bacnet/basic/object/device.c index aedd2d53..a3a612d4 100644 --- a/src/bacnet/basic/object/device.c +++ b/src/bacnet/basic/object/device.c @@ -1920,7 +1920,7 @@ void Routing_Device_Init(uint32_t first_object_instance) #endif /* BAC_ROUTING */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -2011,4 +2011,4 @@ int main(void) return 0; } #endif /* TEST_DEVICE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/device.mak b/src/bacnet/basic/object/device.mak index b6fdf0bb..1d7f1e0d 100644 --- a/src/bacnet/basic/object/device.mak +++ b/src/bacnet/basic/object/device.mak @@ -5,7 +5,7 @@ TEST_DIR = ../../test PORTS_DIR = ../../ports/linux INCLUDES = -I../../include -I$(TEST_DIR) -I$(PORTS_DIR) -I. DEFINES = -DBIG_ENDIAN=0 -DEFINES += -DTEST -DBACDL_TEST +DEFINES += -DBAC_TEST -DBACDL_TEST DEFINES += -DBACAPP_ALL DEFINES += -DMAX_TSM_TRANSACTIONS=0 DEFINES += -DTEST_DEVICE diff --git a/src/bacnet/basic/object/iv.h b/src/bacnet/basic/object/iv.h index c66f2e6b..8ab4394f 100644 --- a/src/bacnet/basic/object/iv.h +++ b/src/bacnet/basic/object/iv.h @@ -131,7 +131,7 @@ extern "C" { void Integer_Value_Init( void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testInteger_Value( diff --git a/src/bacnet/basic/object/lc.c b/src/bacnet/basic/object/lc.c index f3560c81..5a862aab 100644 --- a/src/bacnet/basic/object/lc.c +++ b/src/bacnet/basic/object/lc.c @@ -1004,7 +1004,7 @@ bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1416,4 +1416,4 @@ int main(void) return 0; } #endif /* TEST_LOAD_CONTROL */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/lc.h b/src/bacnet/basic/object/lc.h index 89990821..2de02c57 100644 --- a/src/bacnet/basic/object/lc.h +++ b/src/bacnet/basic/object/lc.h @@ -79,7 +79,7 @@ extern "C" { bool Load_Control_Write_Property( BACNET_WRITE_PROPERTY_DATA * wp_data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testLoadControl( diff --git a/src/bacnet/basic/object/lc.mak b/src/bacnet/basic/object/lc.mak index c353eea0..aa959b5c 100644 --- a/src/bacnet/basic/object/lc.mak +++ b/src/bacnet/basic/object/lc.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/lo.c b/src/bacnet/basic/object/lo.c index 989bb0a8..87f9a38c 100644 --- a/src/bacnet/basic/object/lo.c +++ b/src/bacnet/basic/object/lo.c @@ -1333,7 +1333,7 @@ void Lighting_Output_Init(void) return; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1398,4 +1398,4 @@ int main(void) return 0; } #endif /* TEST_LIGHTING_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/lo.h b/src/bacnet/basic/object/lo.h index dd04a755..1de879dc 100644 --- a/src/bacnet/basic/object/lo.h +++ b/src/bacnet/basic/object/lo.h @@ -216,7 +216,7 @@ extern "C" { bool Lighting_Output_Write_Property( BACNET_WRITE_PROPERTY_DATA * wp_data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testLightingOutput( diff --git a/src/bacnet/basic/object/lo.mak b/src/bacnet/basic/object/lo.mak index a9c50a17..993c3d0a 100644 --- a/src/bacnet/basic/object/lo.mak +++ b/src/bacnet/basic/object/lo.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/lsp.c b/src/bacnet/basic/object/lsp.c index 3189376f..94abe8a6 100644 --- a/src/bacnet/basic/object/lsp.c +++ b/src/bacnet/basic/object/lsp.c @@ -373,7 +373,7 @@ bool Life_Safety_Point_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -438,4 +438,4 @@ int main(void) return 0; } #endif /* TEST_LIFE_SAFETY_POINT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/lsp.h b/src/bacnet/basic/object/lsp.h index 60d2918b..f54ef9a7 100644 --- a/src/bacnet/basic/object/lsp.h +++ b/src/bacnet/basic/object/lsp.h @@ -70,7 +70,7 @@ extern "C" { bool Life_Safety_Point_Write_Property( BACNET_WRITE_PROPERTY_DATA * wp_data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testLifeSafetyPoint( diff --git a/src/bacnet/basic/object/lsp.mak b/src/bacnet/basic/object/lsp.mak index 47cfb85e..b434f24e 100644 --- a/src/bacnet/basic/object/lsp.mak +++ b/src/bacnet/basic/object/lsp.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test 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 diff --git a/src/bacnet/basic/object/ms-input.c b/src/bacnet/basic/object/ms-input.c index f50653f1..952c057e 100644 --- a/src/bacnet/basic/object/ms-input.c +++ b/src/bacnet/basic/object/ms-input.c @@ -727,7 +727,7 @@ bool Multistate_Input_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -799,4 +799,4 @@ int main(void) return 0; } #endif -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/ms-input.h b/src/bacnet/basic/object/ms-input.h index 2d9d16f4..608db7ac 100644 --- a/src/bacnet/basic/object/ms-input.h +++ b/src/bacnet/basic/object/ms-input.h @@ -150,7 +150,7 @@ extern "C" { void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testMultistateInput( diff --git a/src/bacnet/basic/object/ms-input.mak b/src/bacnet/basic/object/ms-input.mak index 6668f42b..15a8c8ae 100644 --- a/src/bacnet/basic/object/ms-input.mak +++ b/src/bacnet/basic/object/ms-input.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test INCLUDES = -I../../include -I$(TEST_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_MULTISTATE_INPUT +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_MULTISTATE_INPUT CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/src/bacnet/basic/object/mso.c b/src/bacnet/basic/object/mso.c index a3a3de5c..42514da2 100644 --- a/src/bacnet/basic/object/mso.c +++ b/src/bacnet/basic/object/mso.c @@ -463,7 +463,7 @@ bool Multistate_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -528,4 +528,4 @@ int main(void) return 0; } #endif /* TEST_BINARY_INPUT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/mso.h b/src/bacnet/basic/object/mso.h index 99515b51..53036f93 100644 --- a/src/bacnet/basic/object/mso.h +++ b/src/bacnet/basic/object/mso.h @@ -127,7 +127,7 @@ extern "C" { uint32_t state_index); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testMultistateOutput( diff --git a/src/bacnet/basic/object/mso.mak b/src/bacnet/basic/object/mso.mak index 0ff54b7f..12998b84 100644 --- a/src/bacnet/basic/object/mso.mak +++ b/src/bacnet/basic/object/mso.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test INCLUDES = -I../../include -I$(TEST_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_MULTISTATE_OUTPUT +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_MULTISTATE_OUTPUT CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/src/bacnet/basic/object/msv.c b/src/bacnet/basic/object/msv.c index 1a5e88c3..bb7ff673 100644 --- a/src/bacnet/basic/object/msv.c +++ b/src/bacnet/basic/object/msv.c @@ -600,7 +600,7 @@ bool Multistate_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -665,4 +665,4 @@ int main(void) return 0; } #endif -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/msv.h b/src/bacnet/basic/object/msv.h index a9793384..49c2f131 100644 --- a/src/bacnet/basic/object/msv.h +++ b/src/bacnet/basic/object/msv.h @@ -131,7 +131,7 @@ extern "C" { void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testMultistateValue( diff --git a/src/bacnet/basic/object/msv.mak b/src/bacnet/basic/object/msv.mak index e4c9ec9a..0ab72915 100644 --- a/src/bacnet/basic/object/msv.mak +++ b/src/bacnet/basic/object/msv.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test INCLUDES = -I../../include -I$(TEST_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_MULTISTATE_VALUE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_MULTISTATE_VALUE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/src/bacnet/basic/object/netport.c b/src/bacnet/basic/object/netport.c index 7108b708..a17bf50e 100644 --- a/src/bacnet/basic/object/netport.c +++ b/src/bacnet/basic/object/netport.c @@ -2411,4 +2411,4 @@ int main(void) return 0; } #endif -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/osv.c b/src/bacnet/basic/object/osv.c index da3f2c07..d91695a2 100644 --- a/src/bacnet/basic/object/osv.c +++ b/src/bacnet/basic/object/osv.c @@ -358,7 +358,7 @@ void OctetString_Value_Intrinsic_Reporting(uint32_t object_instance) { } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -423,4 +423,4 @@ int main(void) return 0; } #endif /* TEST_OCTETSTRING_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/osv.h b/src/bacnet/basic/object/osv.h index 57cf99cf..da088a37 100644 --- a/src/bacnet/basic/object/osv.h +++ b/src/bacnet/basic/object/osv.h @@ -104,7 +104,7 @@ extern "C" { BACNET_STACK_EXPORT void OctetString_Value_Init(void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testOctetString_Value(Test * pTest); diff --git a/src/bacnet/basic/object/osv.mak b/src/bacnet/basic/object/osv.mak index 83f4b06b..c58be784 100644 --- a/src/bacnet/basic/object/osv.mak +++ b/src/bacnet/basic/object/osv.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test INCLUDES = -I../../include -I$(TEST_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DBACNET_PROPERTY_LISTS -DTEST_OCTETSTRING_VALUE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DBACNET_PROPERTY_LISTS -DTEST_OCTETSTRING_VALUE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/src/bacnet/basic/object/piv.c b/src/bacnet/basic/object/piv.c index 5b08365b..a4a1ed89 100644 --- a/src/bacnet/basic/object/piv.c +++ b/src/bacnet/basic/object/piv.c @@ -363,7 +363,7 @@ void PositiveInteger_Value_Intrinsic_Reporting(uint32_t object_instance) { } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -428,4 +428,4 @@ int main(void) return 0; } #endif /* TEST_POSITIVEINTEGER_VALUE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/piv.h b/src/bacnet/basic/object/piv.h index d06f06d4..492f7e1f 100644 --- a/src/bacnet/basic/object/piv.h +++ b/src/bacnet/basic/object/piv.h @@ -103,7 +103,7 @@ extern "C" { BACNET_STACK_EXPORT void PositiveInteger_Value_Init(void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testPositiveInteger_Value(Test * pTest); diff --git a/src/bacnet/basic/object/piv.mak b/src/bacnet/basic/object/piv.mak index 69a70057..9247ffcc 100644 --- a/src/bacnet/basic/object/piv.mak +++ b/src/bacnet/basic/object/piv.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test INCLUDES = -I../../include -I$(TEST_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_POSITIVEINTEGER_VALUE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_POSITIVEINTEGER_VALUE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/src/bacnet/basic/object/schedule.c b/src/bacnet/basic/object/schedule.c index cba7e166..42ceaa2e 100644 --- a/src/bacnet/basic/object/schedule.c +++ b/src/bacnet/basic/object/schedule.c @@ -427,7 +427,7 @@ void Schedule_Recalculate_PV( } } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -481,4 +481,4 @@ int main(void) } #endif /* TEST_SCHEDULE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/object/schedule.mak b/src/bacnet/basic/object/schedule.mak index 4b9a9aca..56411316 100644 --- a/src/bacnet/basic/object/schedule.mak +++ b/src/bacnet/basic/object/schedule.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../../src TEST_DIR = ../../test INCLUDES = -I../../include -I$(TEST_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_SCHEDULE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_SCHEDULE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/src/bacnet/basic/sys/fifo.c b/src/bacnet/basic/sys/fifo.c index 0a9b540a..3e06c2b6 100644 --- a/src/bacnet/basic/sys/fifo.c +++ b/src/bacnet/basic/sys/fifo.c @@ -328,7 +328,7 @@ void FIFO_Init(FIFO_BUFFER *b, volatile uint8_t *buffer, unsigned buffer_len) return; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include diff --git a/src/bacnet/basic/sys/fifo.h b/src/bacnet/basic/sys/fifo.h index 41f3dfee..1a147468 100644 --- a/src/bacnet/basic/sys/fifo.h +++ b/src/bacnet/basic/sys/fifo.h @@ -108,7 +108,7 @@ extern "C" { volatile uint8_t * buffer, unsigned buffer_len); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testFIFOBuffer( diff --git a/src/bacnet/basic/sys/filename.c b/src/bacnet/basic/sys/filename.c index 70633d9a..4de98e4b 100644 --- a/src/bacnet/basic/sys/filename.c +++ b/src/bacnet/basic/sys/filename.c @@ -59,7 +59,7 @@ char *filename_remove_path(const char *filename_in) return filename_out; } -#ifdef TEST +#ifdef BAC_TEST #include #include @@ -109,4 +109,4 @@ int main(void) return 0; } #endif /* TEST_FILENAME */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/sys/key.c b/src/bacnet/basic/sys/key.c index 74f93860..f1d5e217 100644 --- a/src/bacnet/basic/sys/key.c +++ b/src/bacnet/basic/sys/key.c @@ -31,13 +31,13 @@ License. ------------------------------------------- ####COPYRIGHTEND####*/ -/*#define TEST */ +/*#define BAC_TEST */ /*#define TEST_KEY */ #include "key.h" /** @file key.c Tests (only) of key encoding/decoding. */ -#ifdef TEST +#ifdef BAC_TEST #include #include diff --git a/src/bacnet/basic/sys/keylist.c b/src/bacnet/basic/sys/keylist.c index 39eb191e..a3b928f6 100644 --- a/src/bacnet/basic/sys/keylist.c +++ b/src/bacnet/basic/sys/keylist.c @@ -496,7 +496,7 @@ void Keylist_Delete(OS_Keylist list) return; } -#ifdef TEST +#ifdef BAC_TEST #include #include @@ -803,4 +803,4 @@ int main(void) return 0; } #endif /* TEST_KEYLIST */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/sys/keylist.h b/src/bacnet/basic/sys/keylist.h index 79e7d98e..9bd5304f 100644 --- a/src/bacnet/basic/sys/keylist.h +++ b/src/bacnet/basic/sys/keylist.h @@ -121,7 +121,7 @@ extern "C" { int Keylist_Count( OS_Keylist list); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testKeyList( diff --git a/src/bacnet/basic/sys/ringbuf.c b/src/bacnet/basic/sys/ringbuf.c index 1e5fc8ca..ed9a5790 100644 --- a/src/bacnet/basic/sys/ringbuf.c +++ b/src/bacnet/basic/sys/ringbuf.c @@ -455,7 +455,7 @@ bool Ringbuf_Init(RING_BUFFER *b, return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include diff --git a/src/bacnet/basic/sys/ringbuf.h b/src/bacnet/basic/sys/ringbuf.h index 15a7e636..cab6fc4c 100644 --- a/src/bacnet/basic/sys/ringbuf.h +++ b/src/bacnet/basic/sys/ringbuf.h @@ -96,7 +96,7 @@ extern "C" { unsigned element_size, unsigned element_count); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testRingBufPowerOfTwo(Test * pTest); diff --git a/src/bacnet/basic/sys/sbuf.c b/src/bacnet/basic/sys/sbuf.c index d149d842..80c7ad44 100644 --- a/src/bacnet/basic/sys/sbuf.c +++ b/src/bacnet/basic/sys/sbuf.c @@ -130,7 +130,7 @@ bool sbuf_truncate(STATIC_BUFFER *b, /* static buffer structure */ return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include @@ -209,4 +209,4 @@ int main(void) return 0; } #endif /* TEST_STATIC_BUFFER */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/basic/tsm/tsm.c b/src/bacnet/basic/tsm/tsm.c index d8197752..9962bf8d 100644 --- a/src/bacnet/basic/tsm/tsm.c +++ b/src/bacnet/basic/tsm/tsm.c @@ -416,7 +416,7 @@ bool tsm_invoke_id_failed(uint8_t invokeID) return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -469,5 +469,5 @@ int main(void) return 0; } #endif /* TEST_TSM */ -#endif /* TEST */ +#endif /* BAC_TEST */ #endif /* MAX_TSM_TRANSACTIONS */ diff --git a/src/bacnet/config.h b/src/bacnet/config.h index 47d9c4bc..f4e68e24 100644 --- a/src/bacnet/config.h +++ b/src/bacnet/config.h @@ -211,7 +211,7 @@ ** make use of the code space reductions. **/ -#ifdef TEST +#ifdef BAC_TEST #define BACNET_SVC_I_HAVE_A 1 #define BACNET_SVC_WP_A 1 #define BACNET_SVC_RP_A 1 diff --git a/src/bacnet/cov.c b/src/bacnet/cov.c index dcfc5499..950d0294 100644 --- a/src/bacnet/cov.c +++ b/src/bacnet/cov.c @@ -762,7 +762,7 @@ void cov_data_value_list_link( } } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1131,4 +1131,4 @@ int main(int argc, char *argv[]) return 0; } #endif /* TEST_COV */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/cov.h b/src/bacnet/cov.h index f84cda91..48ae9715 100644 --- a/src/bacnet/cov.h +++ b/src/bacnet/cov.h @@ -128,7 +128,7 @@ extern "C" { BACNET_PROPERTY_VALUE *value_list, size_t count); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testCOVNotify( diff --git a/src/bacnet/datalink/bvlc.c b/src/bacnet/datalink/bvlc.c index 7094a2c5..96a12e2f 100644 --- a/src/bacnet/datalink/bvlc.c +++ b/src/bacnet/datalink/bvlc.c @@ -2306,7 +2306,7 @@ int bvlc_decode_foreign_device_table_entry(uint8_t *pdu, return bytes_consumed; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include @@ -3193,4 +3193,4 @@ int main(void) return 0; } #endif /* TEST_BBMD */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/datalink/bvlc.h b/src/bacnet/datalink/bvlc.h index b883c703..2d35f7b6 100644 --- a/src/bacnet/datalink/bvlc.h +++ b/src/bacnet/datalink/bvlc.h @@ -491,7 +491,7 @@ extern "C" { uint16_t npdu_size, uint16_t *npdu_len); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void test_BVLC(Test *pTest); diff --git a/src/bacnet/datalink/bvlc6.c b/src/bacnet/datalink/bvlc6.c index d949b85f..eb4492f5 100644 --- a/src/bacnet/datalink/bvlc6.c +++ b/src/bacnet/datalink/bvlc6.c @@ -1483,7 +1483,7 @@ int bvlc6_decode_distribute_broadcast_to_network(uint8_t *pdu, return bytes_consumed; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -2284,4 +2284,4 @@ int main(void) return 0; } #endif /* TEST_BBMD */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/datalink/bvlc6.h b/src/bacnet/datalink/bvlc6.h index df0cccc4..7ab47215 100644 --- a/src/bacnet/datalink/bvlc6.h +++ b/src/bacnet/datalink/bvlc6.h @@ -417,7 +417,7 @@ extern "C" { uint16_t npdu_size, uint16_t * npdu_len); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void test_BVLC6( diff --git a/src/bacnet/datalink/crc.c b/src/bacnet/datalink/crc.c index c319c247..df0508f7 100644 --- a/src/bacnet/datalink/crc.c +++ b/src/bacnet/datalink/crc.c @@ -141,7 +141,7 @@ uint16_t CRC_Calc_Data(uint8_t dataValue, uint16_t crcValue) } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" diff --git a/src/bacnet/datalink/mstp.c b/src/bacnet/datalink/mstp.c index 2321ccbf..8b345043 100644 --- a/src/bacnet/datalink/mstp.c +++ b/src/bacnet/datalink/mstp.c @@ -1248,7 +1248,7 @@ void MSTP_Init(volatile struct mstp_port_struct_t *mstp_port) } } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "bacnet/basic/sys/ringbuf.h" diff --git a/src/bacnet/datetime.c b/src/bacnet/datetime.c index c493aa44..f5a0353a 100644 --- a/src/bacnet/datetime.c +++ b/src/bacnet/datetime.c @@ -1091,7 +1091,7 @@ int bacapp_decode_context_datetime( return apdu_len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1648,4 +1648,4 @@ int main(void) } #endif /* TEST_DATE_TIME */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/datetime.h b/src/bacnet/datetime.h index 2dce50e3..1761159b 100644 --- a/src/bacnet/datetime.h +++ b/src/bacnet/datetime.h @@ -331,7 +331,7 @@ extern "C" { BACNET_STACK_EXPORT void datetime_init(void); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testDateTime( diff --git a/src/bacnet/dcc.c b/src/bacnet/dcc.c index c8623688..1a3ecb56 100644 --- a/src/bacnet/dcc.c +++ b/src/bacnet/dcc.c @@ -299,7 +299,7 @@ int dcc_decode_service_request(uint8_t *apdu, return apdu_len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -445,4 +445,4 @@ int main(void) return 0; } #endif /* TEST_DEVICE_COMMUNICATION_CONTROL */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/dcc.h b/src/bacnet/dcc.h index f61fe010..a4667e09 100644 --- a/src/bacnet/dcc.h +++ b/src/bacnet/dcc.h @@ -80,7 +80,7 @@ extern "C" { BACNET_COMMUNICATION_ENABLE_DISABLE * enable_disable, BACNET_CHARACTER_STRING * password); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int dcc_decode_apdu( diff --git a/src/bacnet/event.c b/src/bacnet/event.c index b2673a86..f69f7b1d 100644 --- a/src/bacnet/event.c +++ b/src/bacnet/event.c @@ -861,7 +861,7 @@ int event_notify_decode_service_request( return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include @@ -1503,4 +1503,4 @@ int main(void) } #endif /* TEST_EVENT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/getevent.c b/src/bacnet/getevent.c index 860c6562..8bd342cc 100644 --- a/src/bacnet/getevent.c +++ b/src/bacnet/getevent.c @@ -317,7 +317,7 @@ int getevent_ack_decode_service_request(uint8_t *apdu, return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -494,4 +494,4 @@ int main(void) return 0; } #endif -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/getevent.h b/src/bacnet/getevent.h index f64a08e4..20c3966f 100644 --- a/src/bacnet/getevent.h +++ b/src/bacnet/getevent.h @@ -93,7 +93,7 @@ extern "C" { BACNET_GET_EVENT_INFORMATION_DATA * get_event_data, bool * moreEvents); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int getevent_decode_apdu( diff --git a/src/bacnet/iam.c b/src/bacnet/iam.c index 8b566fcf..24884264 100644 --- a/src/bacnet/iam.c +++ b/src/bacnet/iam.c @@ -164,7 +164,7 @@ int iam_decode_service_request(uint8_t *apdu, return apdu_len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -237,4 +237,4 @@ int main(void) return 0; } #endif /* TEST_IAM */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/iam.h b/src/bacnet/iam.h index 0267d670..ce0e3aba 100644 --- a/src/bacnet/iam.h +++ b/src/bacnet/iam.h @@ -51,7 +51,7 @@ extern "C" { int *pSegmentation, uint16_t * pVendor_id); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int iam_decode_apdu( diff --git a/src/bacnet/ihave.c b/src/bacnet/ihave.c index 37dc19d4..0bc21512 100644 --- a/src/bacnet/ihave.c +++ b/src/bacnet/ihave.c @@ -162,7 +162,7 @@ int ihave_decode_apdu( } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -228,4 +228,4 @@ int main(void) return 0; } #endif /* TEST_WHOIS */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/ihave.h b/src/bacnet/ihave.h index 99e3a33e..15a6edf2 100644 --- a/src/bacnet/ihave.h +++ b/src/bacnet/ihave.h @@ -56,7 +56,7 @@ extern "C" { unsigned apdu_len, BACNET_I_HAVE_DATA * data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testIHave( diff --git a/src/bacnet/indtext.c b/src/bacnet/indtext.c index 8b4290d8..214c0111 100644 --- a/src/bacnet/indtext.c +++ b/src/bacnet/indtext.c @@ -182,7 +182,7 @@ unsigned indtext_count(INDTEXT_DATA *data_list) return count; } -#ifdef TEST +#ifdef BAC_TEST #include #include "ctest.h" diff --git a/src/bacnet/indtext.h b/src/bacnet/indtext.h index fd34aa37..c7058df1 100644 --- a/src/bacnet/indtext.h +++ b/src/bacnet/indtext.h @@ -105,7 +105,7 @@ extern "C" { const char *s2); #endif -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testIndexText( diff --git a/src/bacnet/lighting.c b/src/bacnet/lighting.c index 18df2752..f8474bab 100644 --- a/src/bacnet/lighting.c +++ b/src/bacnet/lighting.c @@ -289,7 +289,7 @@ bool lighting_command_same( return status; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -361,4 +361,4 @@ int main(void) } #endif -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/lso.c b/src/bacnet/lso.c index fb0e0de7..6f91686b 100644 --- a/src/bacnet/lso.c +++ b/src/bacnet/lso.c @@ -126,7 +126,7 @@ int lso_decode_service_request( return 0; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -182,4 +182,4 @@ int main(int argc, char *argv[]) return 0; } #endif /* TEST_COV */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/lso.h b/src/bacnet/lso.h index 12d2d0fa..db8c1ba5 100644 --- a/src/bacnet/lso.h +++ b/src/bacnet/lso.h @@ -59,7 +59,7 @@ extern "C" { BACNET_LSO_DATA * data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testLSO( diff --git a/src/bacnet/memcopy.c b/src/bacnet/memcopy.c index 468b9269..9208fc78 100644 --- a/src/bacnet/memcopy.c +++ b/src/bacnet/memcopy.c @@ -120,7 +120,7 @@ size_t memcopy(void *dest, } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include @@ -165,4 +165,4 @@ int main(void) return 0; } #endif -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/npdu.c b/src/bacnet/npdu.c index 6ebfb013..31831240 100644 --- a/src/bacnet/npdu.c +++ b/src/bacnet/npdu.c @@ -498,7 +498,7 @@ int bacnet_npdu_decode(uint8_t *npdu, return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -657,4 +657,4 @@ int main(void) return 0; } #endif /* TEST_NPDU */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/property.c b/src/bacnet/property.c index b5d93672..dac956cc 100644 --- a/src/bacnet/property.c +++ b/src/bacnet/property.c @@ -1534,7 +1534,7 @@ unsigned property_list_special_count( } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -1602,4 +1602,4 @@ int main(void) return 0; } #endif /* TEST_PROPLIST */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/ptransfer.c b/src/bacnet/ptransfer.c index c9cdb8ff..c2f79aa7 100644 --- a/src/bacnet/ptransfer.c +++ b/src/bacnet/ptransfer.c @@ -333,7 +333,7 @@ int ptransfer_ack_encode_apdu(uint8_t *apdu, /* ptransfer_ack_decode_service_request() is the same as ptransfer_decode_service_request */ -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -652,4 +652,4 @@ int main(void) return 0; } #endif /* TEST_READ_PROPERTY */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/ptransfer.h b/src/bacnet/ptransfer.h index ea167022..7262c727 100644 --- a/src/bacnet/ptransfer.h +++ b/src/bacnet/ptransfer.h @@ -77,7 +77,7 @@ extern "C" { /* ptransfer_ack_decode_service_request() is the same as ptransfer_decode_service_request */ -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void test_Private_Transfer_Request( diff --git a/src/bacnet/rd.c b/src/bacnet/rd.c index 475aab4e..8398ec44 100644 --- a/src/bacnet/rd.c +++ b/src/bacnet/rd.c @@ -131,7 +131,7 @@ int rd_decode_service_request(uint8_t *apdu, return (int)len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -211,4 +211,4 @@ int main(void) return 0; } #endif /* TEST_REINITIALIZE_DEVICE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/rd.h b/src/bacnet/rd.h index edb6bd9f..aeb6c4e2 100644 --- a/src/bacnet/rd.h +++ b/src/bacnet/rd.h @@ -61,7 +61,7 @@ extern "C" { BACNET_REINITIALIZED_STATE * state, BACNET_CHARACTER_STRING * password); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int rd_decode_apdu( diff --git a/src/bacnet/reject.c b/src/bacnet/reject.c index 1cc0fcfa..d58d728f 100644 --- a/src/bacnet/reject.c +++ b/src/bacnet/reject.c @@ -199,7 +199,7 @@ int reject_decode_service_request(uint8_t *apdu, } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -322,4 +322,4 @@ int main(void) return 0; } #endif /* TEST_REJECT */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/reject.h b/src/bacnet/reject.h index f17b5d9a..119e5a1c 100644 --- a/src/bacnet/reject.h +++ b/src/bacnet/reject.h @@ -53,7 +53,7 @@ extern "C" { uint8_t * invoke_id, uint8_t * reject_reason); -#ifdef TEST +#ifdef BAC_TEST BACNET_STACK_EXPORT void testReject( Test * pTest); diff --git a/src/bacnet/rp.c b/src/bacnet/rp.c index 917fb698..2b3a0481 100644 --- a/src/bacnet/rp.c +++ b/src/bacnet/rp.c @@ -340,7 +340,7 @@ int rp_ack_decode_service_request(uint8_t *apdu, } #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -494,4 +494,4 @@ int main(void) return 0; } #endif /* TEST_READ_PROPERTY */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/rp.h b/src/bacnet/rp.h index fb32dff0..2e947fd1 100644 --- a/src/bacnet/rp.h +++ b/src/bacnet/rp.h @@ -106,7 +106,7 @@ extern "C" { int apdu_len, struct BACnet_Read_Access_Data *read_access_data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int rp_decode_apdu( diff --git a/src/bacnet/rpm.c b/src/bacnet/rpm.c index 215cb4a8..ddc2a46a 100644 --- a/src/bacnet/rpm.c +++ b/src/bacnet/rpm.c @@ -586,7 +586,7 @@ int rpm_ack_decode_object_property(uint8_t *apdu, #endif -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -990,4 +990,4 @@ int main(void) } #endif /* TEST_READ_PROPERTY_MULTIPLE */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/rpm.h b/src/bacnet/rpm.h index 86fd33a9..161cb07c 100644 --- a/src/bacnet/rpm.h +++ b/src/bacnet/rpm.h @@ -184,7 +184,7 @@ extern "C" { unsigned apdu_len, BACNET_PROPERTY_ID * object_property, BACNET_ARRAY_INDEX * array_index); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int rpm_decode_apdu( diff --git a/src/bacnet/timestamp.c b/src/bacnet/timestamp.c index 25557965..67f8e312 100644 --- a/src/bacnet/timestamp.c +++ b/src/bacnet/timestamp.c @@ -265,7 +265,7 @@ int bacapp_decode_context_timestamp( return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include @@ -406,4 +406,4 @@ int main(void) } #endif /* TEST_TIME_STAMP */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/timesync.c b/src/bacnet/timesync.c index 0be92460..cd015e3e 100644 --- a/src/bacnet/timesync.c +++ b/src/bacnet/timesync.c @@ -348,7 +348,7 @@ int timesync_decode_timesync_recipients( return apdu_len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -556,4 +556,4 @@ int main(void) return 0; } #endif /* TEST_WHOIS */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/timesync.h b/src/bacnet/timesync.h index 548228d7..a3761a29 100644 --- a/src/bacnet/timesync.h +++ b/src/bacnet/timesync.h @@ -98,7 +98,7 @@ extern "C" { unsigned apdu_len, BACNET_RECIPIENT_LIST * recipient); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testTimeSync( diff --git a/src/bacnet/whohas.c b/src/bacnet/whohas.c index 242c2cde..48593d1c 100644 --- a/src/bacnet/whohas.c +++ b/src/bacnet/whohas.c @@ -157,7 +157,7 @@ int whohas_decode_service_request( return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -264,4 +264,4 @@ int main(void) return 0; } #endif /* TEST_WHOIS */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/whohas.h b/src/bacnet/whohas.h index 426e722b..5b7012dc 100644 --- a/src/bacnet/whohas.h +++ b/src/bacnet/whohas.h @@ -61,7 +61,7 @@ extern "C" { unsigned apdu_len, BACNET_WHO_HAS_DATA * data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT void testWhoHas( diff --git a/src/bacnet/whois.c b/src/bacnet/whois.c index 871285d2..289a2574 100644 --- a/src/bacnet/whois.c +++ b/src/bacnet/whois.c @@ -120,7 +120,7 @@ int whois_decode_service_request( return (int)len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -224,4 +224,4 @@ int main(void) return 0; } #endif /* TEST_WHOIS */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/whois.h b/src/bacnet/whois.h index 3b2e3954..cf1e6e40 100644 --- a/src/bacnet/whois.h +++ b/src/bacnet/whois.h @@ -46,7 +46,7 @@ extern "C" { int32_t * pLow_limit, int32_t * pHigh_limit); -#ifdef TEST +#ifdef BAC_TEST BACNET_STACK_EXPORT int whois_decode_apdu( uint8_t * apdu, diff --git a/src/bacnet/wp.c b/src/bacnet/wp.c index ec437604..9b25557d 100644 --- a/src/bacnet/wp.c +++ b/src/bacnet/wp.c @@ -198,7 +198,7 @@ int wp_decode_service_request( return len; } -#ifdef TEST +#ifdef BAC_TEST #include #include #include "ctest.h" @@ -399,4 +399,4 @@ int main(void) return 0; } #endif /* TEST_WRITE_PROPERTY */ -#endif /* TEST */ +#endif /* BAC_TEST */ diff --git a/src/bacnet/wp.h b/src/bacnet/wp.h index e3331934..5b777308 100644 --- a/src/bacnet/wp.h +++ b/src/bacnet/wp.h @@ -80,7 +80,7 @@ extern "C" { unsigned apdu_len, BACNET_WRITE_PROPERTY_DATA * wp_data); -#ifdef TEST +#ifdef BAC_TEST #include "ctest.h" BACNET_STACK_EXPORT int wp_decode_apdu( diff --git a/test/abort.mak b/test/abort.mak index ab0c4e7c..765ec27c 100644 --- a/test/abort.mak +++ b/test/abort.mak @@ -2,7 +2,7 @@ SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ABORT +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_ABORT CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/address.mak b/test/address.mak index eb4a0cb6..15af4175 100644 --- a/test/address.mak +++ b/test/address.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ADDRESS -DBACNET_ADDRESS_CACHE_FILE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_ADDRESS -DBACNET_ADDRESS_CACHE_FILE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/arf.mak b/test/arf.mak index cddf9264..c5d22610 100644 --- a/test/arf.mak +++ b/test/arf.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -I../demo/object -DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_READ_FILE +DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_ATOMIC_READ_FILE DEFINES += -DBACNET_READ_FILE_RECORD_COUNT=2 CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/awf.mak b/test/awf.mak index 8fe5a0b0..635166d1 100644 --- a/test/awf.mak +++ b/test/awf.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -I../demo/object -DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_WRITE_FILE +DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_ATOMIC_WRITE_FILE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g SRCS = $(SRC_DIR)/bacnet/bacdcode.c \ diff --git a/test/bacapp.mak b/test/bacapp.mak index 15d47718..4333112a 100644 --- a/test/bacapp.mak +++ b/test/bacapp.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACNET_APPLICATION_DATA +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BACNET_APPLICATION_DATA CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g SRCS = $(SRC_DIR)/bacnet/bacdcode.c \ diff --git a/test/bacdcode.mak b/test/bacdcode.mak index bf63e8e3..38268a9f 100644 --- a/test/bacdcode.mak +++ b/test/bacdcode.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DECODE -DMAX_APDU=50 +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_DECODE -DMAX_APDU=50 CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/bacdevobjpropref.mak b/test/bacdevobjpropref.mak index eeb35d61..7e15eec6 100644 --- a/test/bacdevobjpropref.mak +++ b/test/bacdevobjpropref.mak @@ -3,7 +3,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DEV_ID_PROP_REF +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_DEV_ID_PROP_REF CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g SRCS = $(SRC_DIR)/bacnet/bacdcode.c \ diff --git a/test/bacerror.mak b/test/bacerror.mak index e049bef6..e37aa702 100644 --- a/test/bacerror.mak +++ b/test/bacerror.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACERROR +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BACERROR CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/bacint.mak b/test/bacint.mak index 7830cf7b..2aa3251c 100644 --- a/test/bacint.mak +++ b/test/bacint.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACINT +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BACINT CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/bacstr.mak b/test/bacstr.mak index fd8b96d9..547d194d 100644 --- a/test/bacstr.mak +++ b/test/bacstr.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACSTR +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BACSTR CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/bbmd6.mak b/test/bbmd6.mak index f63b194d..7e025158 100644 --- a/test/bbmd6.mak +++ b/test/bbmd6.mak @@ -5,7 +5,7 @@ SRC_INC = ../include DEMO_DIR = ../demo/handler DEMO_INC = ../demo/object INCLUDES = -I. -I$(SRC_INC) -I$(DEMO_INC) -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BBMD6 +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BBMD6 CFLAGS = -Wall -Wmissing-prototypes $(INCLUDES) $(DEFINES) -g diff --git a/test/bvlc.mak b/test/bvlc.mak index 2793ae2a..daa66e7b 100644 --- a/test/bvlc.mak +++ b/test/bvlc.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBACDL_BIP -DBIG_ENDIAN=0 -DTEST -DTEST_BVLC +DEFINES = -DBACDL_BIP -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BVLC CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/bvlc6.mak b/test/bvlc6.mak index cbae0c4a..62c950fa 100644 --- a/test/bvlc6.mak +++ b/test/bvlc6.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BVLC6 +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_BVLC6 CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/cov.mak b/test/cov.mak index fc5314b2..c01986a9 100644 --- a/test/cov.mak +++ b/test/cov.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -I../demo/object -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_COV -DBACAPP_ALL +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_COV -DBACAPP_ALL CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/crc.mak b/test/crc.mak index 96b0e889..07a84011 100644 --- a/test/crc.mak +++ b/test/crc.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -I../demo/object -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_CRC +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_CRC CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/datetime.mak b/test/datetime.mak index 3b593eb3..7ce9bc00 100644 --- a/test/datetime.mak +++ b/test/datetime.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DATE_TIME +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_DATE_TIME CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/dcc.mak b/test/dcc.mak index 1a8e15f0..2a0d4748 100644 --- a/test/dcc.mak +++ b/test/dcc.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DEVICE_COMMUNICATION_CONTROL +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_DEVICE_COMMUNICATION_CONTROL CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/event.mak b/test/event.mak index c2781911..383efad9 100644 --- a/test/event.mak +++ b/test/event.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -I../demo/object -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_EVENT +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_EVENT CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/fifo.mak b/test/fifo.mak index 18838d9e..0db09601 100644 --- a/test/fifo.mak +++ b/test/fifo.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_FIFO_BUFFER +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_FIFO_BUFFER CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/filename.mak b/test/filename.mak index 600dfb4b..ce2c9e1f 100644 --- a/test/filename.mak +++ b/test/filename.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_FILENAME +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_FILENAME CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/getevent.mak b/test/getevent.mak index 8c1f482d..c5d09c1d 100644 --- a/test/getevent.mak +++ b/test/getevent.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_GET_EVENT_INFORMATION +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_GET_EVENT_INFORMATION CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/iam.mak b/test/iam.mak index 67fc5fd0..e268da2e 100755 --- a/test/iam.mak +++ b/test/iam.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -I../demo/object -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_IAM +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_IAM CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/ihave.mak b/test/ihave.mak index 8e43d99c..88bb7529 100644 --- a/test/ihave.mak +++ b/test/ihave.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_I_HAVE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_I_HAVE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/indtext.mak b/test/indtext.mak index 918f3474..97203315 100644 --- a/test/indtext.mak +++ b/test/indtext.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_INDEX_TEXT +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_INDEX_TEXT CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/key.mak b/test/key.mak index d86cea2e..0d444837 100644 --- a/test/key.mak +++ b/test/key.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_KEY +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_KEY CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/keylist.mak b/test/keylist.mak index 0aea209b..620355f4 100644 --- a/test/keylist.mak +++ b/test/keylist.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_KEYLIST +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_KEYLIST CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/lighting.mak b/test/lighting.mak index c5bd2850..cf3d95a0 100644 --- a/test/lighting.mak +++ b/test/lighting.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_LIGHTING_COMMAND +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_LIGHTING_COMMAND CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/lso.mak b/test/lso.mak index 85ff91e6..d742398e 100644 --- a/test/lso.mak +++ b/test/lso.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LSO +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_LSO CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/memcopy.mak b/test/memcopy.mak index 03304e88..a33358b8 100644 --- a/test/memcopy.mak +++ b/test/memcopy.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_MEM_COPY +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_MEM_COPY CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/mstp.mak b/test/mstp.mak index 5e8f8d51..a3361b53 100644 --- a/test/mstp.mak +++ b/test/mstp.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -I../ports/linux -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_MSTP +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_MSTP CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/npdu.mak b/test/npdu.mak index 2cc90b5c..e66f1be9 100644 --- a/test/npdu.mak +++ b/test/npdu.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_NPDU +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_NPDU CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/proplist.mak b/test/proplist.mak index 6f095771..6852f4ca 100644 --- a/test/proplist.mak +++ b/test/proplist.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_PROPLIST +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_PROPLIST DEFINES += -DBACNET_PROPERTY_LISTS=1 CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/ptransfer.mak b/test/ptransfer.mak index aa53da27..68c03974 100644 --- a/test/ptransfer.mak +++ b/test/ptransfer.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DPRINT_ENABLE=1 -DTEST -DTEST_PRIVATE_TRANSFER +DEFINES = -DBIG_ENDIAN=0 -DPRINT_ENABLE=1 -DBAC_TEST -DTEST_PRIVATE_TRANSFER CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/rd.mak b/test/rd.mak index 2c544dd7..9da523c8 100644 --- a/test/rd.mak +++ b/test/rd.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_REINITIALIZE_DEVICE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_REINITIALIZE_DEVICE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/reject.mak b/test/reject.mak index 27c75ad5..e574377c 100644 --- a/test/reject.mak +++ b/test/reject.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_REJECT +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_REJECT CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/ringbuf.mak b/test/ringbuf.mak index cebd5fc3..4240c501 100644 --- a/test/ringbuf.mak +++ b/test/ringbuf.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_RING_BUFFER +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_RING_BUFFER CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/rp.mak b/test/rp.mak index af0f69bb..a2baf1d6 100644 --- a/test/rp.mak +++ b/test/rp.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_READ_PROPERTY +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_READ_PROPERTY CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/rpm.mak b/test/rpm.mak index baf8c1d4..4b4d500c 100644 --- a/test/rpm.mak +++ b/test/rpm.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_READ_PROPERTY_MULTIPLE +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_READ_PROPERTY_MULTIPLE CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/sbuf.mak b/test/sbuf.mak index b4c9f0ea..5d2e80a4 100644 --- a/test/sbuf.mak +++ b/test/sbuf.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_STATIC_BUFFER +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_STATIC_BUFFER CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/timer.mak b/test/timer.mak index 79773208..81993537 100644 --- a/test/timer.mak +++ b/test/timer.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../ports/bdk-atxx4-mstp INCLUDES = -I$(SRC_DIR) -I${SRC_DIR} -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_TIMER +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_TIMER CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/timesync.mak b/test/timesync.mak index 3439c534..83ea9223 100644 --- a/test/timesync.mak +++ b/test/timesync.mak @@ -11,7 +11,7 @@ SRC_DIR := ../src INCLUDES := -I$(SRC_DIR) -I. -DEFINES := -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_TIMESYNC +DEFINES := -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_TIMESYNC CFLAGS := $(INCLUDES) $(DEFINES) -g CFLAGS += -Wall diff --git a/test/vmac.mak b/test/vmac.mak index f2669d76..b7389466 100644 --- a/test/vmac.mak +++ b/test/vmac.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_VMAC +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_VMAC CFLAGS = -Wall -Wmissing-prototypes $(INCLUDES) $(DEFINES) -g diff --git a/test/whohas.mak b/test/whohas.mak index 242e25d9..4f62563b 100644 --- a/test/whohas.mak +++ b/test/whohas.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_WHOHAS +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_WHOHAS CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/whois.mak b/test/whois.mak index 21870dda..4f6ffe1c 100644 --- a/test/whois.mak +++ b/test/whois.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_WHOIS +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DTEST_WHOIS CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/test/wp.mak b/test/wp.mak index 8ab2e1e8..9939ac6f 100644 --- a/test/wp.mak +++ b/test/wp.mak @@ -2,7 +2,7 @@ CC = gcc SRC_DIR = ../src INCLUDES = -I$(SRC_DIR) -I. -DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_WRITE_PROPERTY +DEFINES = -DBIG_ENDIAN=0 -DBAC_TEST -DBACAPP_ALL -DTEST_WRITE_PROPERTY CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g