From 466dadc28d4d7a38f2dc24275db0b16bf375b8ef Mon Sep 17 00:00:00 2001 From: skarg Date: Fri, 9 Nov 2007 04:08:26 +0000 Subject: [PATCH] Updated unit test makefiles. --- bacnet-stack/test.mak | 189 +++++++++++++++++++++++++++++++++++++- bacnet-stack/test/arf.mak | 2 +- bacnet-stack/test/awf.mak | 2 +- bacnet-stack/test/dcc.mak | 24 ++--- bacnet-stack/test/rd.mak | 2 +- bacnet-stack/test/rp.mak | 2 +- bacnet-stack/test/wp.mak | 2 +- bacnet-stack/unittest.sh | 150 +----------------------------- 8 files changed, 205 insertions(+), 168 deletions(-) diff --git a/bacnet-stack/test.mak b/bacnet-stack/test.mak index a69681f2..fd6b2ee3 100644 --- a/bacnet-stack/test.mak +++ b/bacnet-stack/test.mak @@ -1,6 +1,9 @@ LOGFILE = test.log -all: abort datetime +all: abort address arf awf bacapp bacdcode bacerror bacint \ + bacstr cov crc datetime dcc filename iam ihave \ + indtext keylist key mstp npdu rd reject ringbuf rp \ + rpm sbuf timesync tsm whohas whois wp clean: rm ${LOGFILE} @@ -8,14 +11,194 @@ clean: logfile: touch ${LOGFILE} -abort: test/abort.mak logfile +abort: logfile test/abort.mak ( cd test ; make -f abort.mak clean ) ( cd test ; make -f abort.mak ) ( ./test/abort >> ${LOGFILE} ) ( cd test ; make -f abort.mak clean ) -datetime: test/datetime.mak logfile +address: logfile test/address.mak + ( cd test ; make -f address.mak clean ) + ( cd test ; make -f address.mak ) + ( ./test/address >> ${LOGFILE} ) + ( cd test ; make -f address.mak clean ) + +arf: logfile test/arf.mak + ( cd test ; make -f arf.mak clean ) + ( cd test ; make -f arf.mak ) + ( ./test/arf >> ${LOGFILE} ) + ( cd test ; make -f arf.mak clean ) + +awf: logfile test/awf.mak + ( cd test ; make -f awf.mak clean ) + ( cd test ; make -f awf.mak ) + ( ./test/awf >> ${LOGFILE} ) + ( cd test ; make -f awf.mak clean ) + +bacapp: logfile test/bacapp.mak + ( cd test ; make -f bacapp.mak clean ) + ( cd test ; make -f bacapp.mak ) + ( ./test/bacapp >> ${LOGFILE} ) + ( cd test ; make -f bacapp.mak clean ) + +bacdcode: logfile test/bacdcode.mak + ( cd test ; make -f bacdcode.mak clean ) + ( cd test ; make -f bacdcode.mak ) + ( ./test/bacdcode >> ${LOGFILE} ) + ( cd test ; make -f bacdcode.mak clean ) + +bacerror: logfile test/bacerror.mak + ( cd test ; make -f bacerror.mak clean ) + ( cd test ; make -f bacerror.mak ) + ( ./test/bacerror >> ${LOGFILE} ) + ( cd test ; make -f bacerror.mak clean ) + +bacint: logfile test/bacint.mak + ( cd test ; make -f bacint.mak clean ) + ( cd test ; make -f bacint.mak ) + ( ./test/bacint >> ${LOGFILE} ) + ( cd test ; make -f bacint.mak clean ) + +bacstr: logfile test/bacstr.mak + ( cd test ; make -f bacstr.mak clean ) + ( cd test ; make -f bacstr.mak ) + ( ./test/bacstr >> ${LOGFILE} ) + ( cd test ; make -f bacstr.mak clean ) + +cov: logfile test/cov.mak + ( cd test ; make -f cov.mak clean ) + ( cd test ; make -f cov.mak ) + ( ./test/cov >> ${LOGFILE} ) + ( cd test ; make -f cov.mak clean ) + +crc: logfile test/crc.mak + ( cd test ; make -f crc.mak clean ) + ( cd test ; make -f crc.mak ) + ( ./test/crc >> ${LOGFILE} ) + ( cd test ; make -f crc.mak clean ) + +datetime: logfile test/datetime.mak ( cd test ; make -f datetime.mak clean ) ( cd test ; make -f datetime.mak ) ( ./test/datetime >> ${LOGFILE} ) ( cd test ; make -f datetime.mak clean ) + +dcc: logfile test/dcc.mak + ( cd test ; make -f dcc.mak clean ) + ( cd test ; make -f dcc.mak ) + ( ./test/dcc >> ${LOGFILE} ) + ( cd test ; make -f dcc.mak clean ) + +filename: logfile test/filename.mak + ( cd test ; make -f filename.mak clean ) + ( cd test ; make -f filename.mak ) + ( ./test/filename >> ${LOGFILE} ) + ( cd test ; make -f filename.mak clean ) + +iam: logfile test/iam.mak + ( cd test ; make -f iam.mak clean ) + ( cd test ; make -f iam.mak ) + ( ./test/iam >> ${LOGFILE} ) + ( cd test ; make -f iam.mak clean ) + +ihave: logfile test/ihave.mak + ( cd test ; make -f ihave.mak clean ) + ( cd test ; make -f ihave.mak ) + ( ./test/ihave >> ${LOGFILE} ) + ( cd test ; make -f ihave.mak clean ) + +indtext: logfile test/indtext.mak + ( cd test ; make -f indtext.mak clean ) + ( cd test ; make -f indtext.mak ) + ( ./test/indtext >> ${LOGFILE} ) + ( cd test ; make -f indtext.mak clean ) + +keylist: logfile test/keylist.mak + ( cd test ; make -f keylist.mak clean ) + ( cd test ; make -f keylist.mak ) + ( ./test/keylist >> ${LOGFILE} ) + ( cd test ; make -f keylist.mak clean ) + +key: logfile test/key.mak + ( cd test ; make -f key.mak clean ) + ( cd test ; make -f key.mak ) + ( ./test/key >> ${LOGFILE} ) + ( cd test ; make -f key.mak clean ) + +mstp: logfile test/mstp.mak + ( cd test ; make -f mstp.mak clean ) + ( cd test ; make -f mstp.mak ) + ( ./test/mstp >> ${LOGFILE} ) + ( cd test ; make -f mstp.mak clean ) + +npdu: logfile test/npdu.mak + ( cd test ; make -f npdu.mak clean ) + ( cd test ; make -f npdu.mak ) + ( ./test/npdu >> ${LOGFILE} ) + ( cd test ; make -f npdu.mak clean ) + +rd: logfile test/rd.mak + ( cd test ; make -f rd.mak clean ) + ( cd test ; make -f rd.mak ) + ( ./test/rd >> ${LOGFILE} ) + ( cd test ; make -f rd.mak clean ) + +reject: logfile test/reject.mak + ( cd test ; make -f reject.mak clean ) + ( cd test ; make -f reject.mak ) + ( ./test/reject >> ${LOGFILE} ) + ( cd test ; make -f reject.mak clean ) + +ringbuf: logfile test/ringbuf.mak + ( cd test ; make -f ringbuf.mak clean ) + ( cd test ; make -f ringbuf.mak ) + ( ./test/ringbuf >> ${LOGFILE} ) + ( cd test ; make -f ringbuf.mak clean ) + +rp: logfile test/rp.mak + ( cd test ; make -f rp.mak clean ) + ( cd test ; make -f rp.mak ) + ( ./test/rp >> ${LOGFILE} ) + ( cd test ; make -f rp.mak clean ) + +rpm: logfile test/rpm.mak + ( cd test ; make -f rpm.mak clean ) + ( cd test ; make -f rpm.mak ) + ( ./test/rpm >> ${LOGFILE} ) + ( cd test ; make -f rpm.mak clean ) + +sbuf: logfile test/sbuf.mak + ( cd test ; make -f sbuf.mak clean ) + ( cd test ; make -f sbuf.mak ) + ( ./test/sbuf >> ${LOGFILE} ) + ( cd test ; make -f sbuf.mak clean ) + +timesync: logfile test/timesync.mak + ( cd test ; make -f timesync.mak clean ) + ( cd test ; make -f timesync.mak ) + ( ./test/timesync >> ${LOGFILE} ) + ( cd test ; make -f timesync.mak clean ) + +tsm: logfile test/tsm.mak + ( cd test ; make -f tsm.mak clean ) + ( cd test ; make -f tsm.mak ) + ( ./test/tsm >> ${LOGFILE} ) + ( cd test ; make -f tsm.mak clean ) + +whohas: logfile test/whohas.mak + ( cd test ; make -f whohas.mak clean ) + ( cd test ; make -f whohas.mak ) + ( ./test/whohas >> ${LOGFILE} ) + ( cd test ; make -f whohas.mak clean ) + +whois: logfile test/whois.mak + ( cd test ; make -f whois.mak clean ) + ( cd test ; make -f whois.mak ) + ( ./test/whois >> ${LOGFILE} ) + ( cd test ; make -f whois.mak clean ) + +wp: logfile test/wp.mak + ( cd test ; make -f wp.mak clean ) + ( cd test ; make -f wp.mak ) + ( ./test/wp >> ${LOGFILE} ) + ( cd test ; make -f wp.mak clean ) diff --git a/bacnet-stack/test/arf.mak b/bacnet-stack/test/arf.mak index 1a1cc155..6188a8a8 100644 --- a/bacnet-stack/test/arf.mak +++ b/bacnet-stack/test/arf.mak @@ -14,7 +14,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ OBJS = ${SRCS:.c=.o} -TARGET = atomicreadfile +TARGET = arf all: ${TARGET} diff --git a/bacnet-stack/test/awf.mak b/bacnet-stack/test/awf.mak index d83b931d..c293325d 100644 --- a/bacnet-stack/test/awf.mak +++ b/bacnet-stack/test/awf.mak @@ -15,7 +15,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ OBJS = ${SRCS:.c=.o} -TARGET = atomicwritefile +TARGET = awf all: ${TARGET} diff --git a/bacnet-stack/test/dcc.mak b/bacnet-stack/test/dcc.mak index ec860f2c..aa04479b 100644 --- a/bacnet-stack/test/dcc.mak +++ b/bacnet-stack/test/dcc.mak @@ -1,24 +1,24 @@ #Makefile to build test case CC = gcc -BASEDIR = . -#CFLAGS = -Wall -I. -# -g for debugging with gdb -#CFLAGS = -Wall -I. -g -CFLAGS = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_DEVICE_COMMUNICATION_CONTROL -g +SRC_DIR = ../src +INCLUDES = -I../include -I. +DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DEVICE_COMMUNICATION_CONTROL -SRCS = bacdcode.c \ - bacint.c \ - bacstr.c \ - bigend.c \ - dcc.c \ - test/ctest.c +CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g -OBJS = ${SRCS:.c=.o} +SRCS = $(SRC_DIR)/bacdcode.c \ + $(SRC_DIR)/bacint.c \ + $(SRC_DIR)/bacstr.c \ + $(SRC_DIR)/bacreal.c \ + $(SRC_DIR)/dcc.c \ + ctest.c TARGET = dcc all: ${TARGET} +OBJS = ${SRCS:.c=.o} + ${TARGET}: ${OBJS} ${CC} -o $@ ${OBJS} diff --git a/bacnet-stack/test/rd.mak b/bacnet-stack/test/rd.mak index 16a5468b..7fae4647 100644 --- a/bacnet-stack/test/rd.mak +++ b/bacnet-stack/test/rd.mak @@ -13,7 +13,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/rd.c \ ctest.c -TARGET = reinitialize_device +TARGET = rd all: ${TARGET} diff --git a/bacnet-stack/test/rp.mak b/bacnet-stack/test/rp.mak index 004127e0..7387fc14 100644 --- a/bacnet-stack/test/rp.mak +++ b/bacnet-stack/test/rp.mak @@ -13,7 +13,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/rp.c \ ctest.c -TARGET = readproperty +TARGET = rp all: ${TARGET} diff --git a/bacnet-stack/test/wp.mak b/bacnet-stack/test/wp.mak index e3ace2f2..4d8bd055 100644 --- a/bacnet-stack/test/wp.mak +++ b/bacnet-stack/test/wp.mak @@ -17,7 +17,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/wp.c \ ctest.c -TARGET = writeproperty +TARGET = wp all: ${TARGET} diff --git a/bacnet-stack/unittest.sh b/bacnet-stack/unittest.sh index df8673fd..4dcd796e 100755 --- a/bacnet-stack/unittest.sh +++ b/bacnet-stack/unittest.sh @@ -1,28 +1,8 @@ #!/bin/sh # Unit tests builder / runner for this project -rm test.log -touch test.log - -make -f test/abort.mak clean -make -f test/abort.mak -./abort >> test.log -make -f test/abort.mak clean - -make -f address.mak clean -make -f address.mak -./address >> test.log -make -f address.mak clean - -make -f cov.mak clean -make -f cov.mak -./cov >> test.log -make -f cov.mak clean - -make -f dcc.mak clean -make -f dcc.mak -./dcc >> test.log -make -f dcc.mak clean +make -f test.mak clean +make -f test.mak make -f demo/object/ai.mak clean make -f demo/object/ai.mak @@ -39,36 +19,6 @@ make -f demo/object/av.mak ./analog_value >> test.log make -f demo/object/av.mak clean -make -f arf.mak clean -make -f arf.mak -./atomicreadfile >> test.log -make -f arf.mak clean - -make -f awf.mak clean -make -f awf.mak -./atomicwritefile >> test.log -make -f awf.mak clean - -make -f bacapp.mak clean -make -f bacapp.mak -./bacapp >> test.log -make -f bacapp.mak clean - -make -f bacdcode.mak clean -make -f bacdcode.mak -./bacdcode >> test.log -make -f bacdcode.mak clean - -make -f bacerror.mak clean -make -f bacerror.mak -./bacerror >> test.log -make -f bacerror.mak clean - -make -f bacstr.mak clean -make -f bacstr.mak -./bacstr >> test.log -make -f bacstr.mak clean - make -f demo/object/bi.mak clean make -f demo/object/bi.mak ./binary_input >> test.log @@ -84,48 +34,11 @@ make -f demo/object/bv.mak ./binary_value >> test.log make -f demo/object/bv.mak clean -make -f crc.mak clean -make -f crc.mak -./crc >> test.log -make -f crc.mak clean - -make -f datetime.mak clean -make -f datetime.mak -./datetime >> test.log -make -f datetime.mak clean - make -f demo/object/device.mak clean make -f demo/object/device.mak ./device >> test.log make -f demo/object/device.mak clean -cd src/iam -make clean -make -./iam >> ../../test.log -make clean -cd ../../ - -make -f ihave.mak clean -make -f ihave.mak -./ihave >> test.log -make -f ihave.mak clean - -make -f indtext.mak clean -make -f indtext.mak -./indtext >> test.log -make -f indtext.mak clean - -make -f test/key.mak clean -make -f test/key.mak -./key >> test.log -make -f test/key.mak clean - -make -f test/keylist.mak clean -make -f test/keylist.mak -./keylist >> test.log -make -f test/keylist.mak clean - make -f demo/object/lc.mak clean make -f demo/object/lc.mak ./loadcontrol >> test.log @@ -141,62 +54,3 @@ make -f demo/object/mso.mak ./multistate_output >> test.log make -f demo/object/mso.mak clean -make -f mstp.mak clean -make -f mstp.mak -./mstp >> test.log -make -f mstp.mak clean - -make -f npdu.mak clean -make -f npdu.mak -./npdu >> test.log -make -f npdu.mak clean - -make -f rd.mak clean -make -f rd.mak -./reinitialize_device >> test.log -make -f rd.mak clean - -make -f reject.mak clean -make -f reject.mak -./reject >> test.log -make -f reject.mak clean - -make -f ringbuf.mak clean -make -f ringbuf.mak -./ringbuf >> test.log -make -f ringbuf.mak clean - -make -f rp.mak clean -make -f rp.mak -./readproperty >> test.log -make -f rp.mak clean - -make -f rpm.mak clean -make -f rpm.mak -./rpm >> test.log -make -f rpm.mak clean - -make -f sbuf.mak clean -make -f sbuf.mak -./sbuf >> test.log -make -f sbuf.mak clean - -make -f tsm.mak clean -make -f tsm.mak -./tsm >> test.log -make -f tsm.mak clean - -make -f whois.mak clean -make -f whois.mak -./whois >> test.log -make -f whois.mak clean - -make -f whohas.mak clean -make -f whohas.mak -./whohas >> test.log -make -f whohas.mak clean - -make -f wp.mak clean -make -f wp.mak -./writeproperty >> test.log -make -f wp.mak clean