ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-21 09:51:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into rhizomedirect

Browse Source
This commit is contained in:
Andrew Bettison 2012-08-30 09:38:19 +09:30
commit 420add0f4b
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in Normal file → Executable file
View File

@ -51,7 +51,7 @@ SRCS= \
sha2.c \ sha2.c \
sighandlers.c \ sighandlers.c \
simulate.c \ simulate.c \
sqlite3.c \ sqlite-amalgamation-3070900/sqlite3.c \
srandomdev.c \ srandomdev.c \
str.c \ str.c \
strbuf.c \ strbuf.c \
@ -96,7 +96,7 @@ HDRS= fifo.h \
LDFLAGS=@LDFLAGS@ @PORTAUDIO_LIBS@ @SRC_LIBS@ @SPANDSP_LIBS@ @CODEC2_LIBS@ @PTHREAD_LIBS@ LDFLAGS=@LDFLAGS@ @PORTAUDIO_LIBS@ @SRC_LIBS@ @SPANDSP_LIBS@ @CODEC2_LIBS@ @PTHREAD_LIBS@
CFLAGS= @CPPFLAGS@ @CFLAGS@ @PORTAUDIO_CFLAGS@ @SRC_CFLAGS@ @SPANDSP_CFLAGS@ @PTHREAD_CFLAGS@ $(VOIPTEST_CFLAGS) CFLAGS= -Isqlite-amalgamation-3070900 @CPPFLAGS@ @CFLAGS@ @PORTAUDIO_CFLAGS@ @SRC_CFLAGS@ @SPANDSP_CFLAGS@ @PTHREAD_CFLAGS@ $(VOIPTEST_CFLAGS)
CFLAGS+=-fPIC CFLAGS+=-fPIC
CFLAGS+=-Wall -Wno-unused-value CFLAGS+=-Wall -Wno-unused-value
-include Makefile.dbg -include Makefile.dbg
@ -105,9 +105,9 @@ DEFS= @DEFS@
all: servald libmonitorclient.so libmonitorclient.a all: servald libmonitorclient.so libmonitorclient.a
sqlite3.o: sqlite3.c sqlite-amalgamation-3070900/sqlite3.o: sqlite-amalgamation-3070900/sqlite3.c
@echo CC $< @echo CC $<
@$(CC) $(CFLAGS) $(DEFS) -c $< @$(CC) $(CFLAGS) $(DEFS) -c $< -o sqlite-amalgamation-3070900/sqlite3.o
%.o: %.c $(HDRS) %.o: %.c $(HDRS)
@echo CC $< @echo CC $<

1
sqlite3.c
View File

@ -1 +0,0 @@
sqlite-amalgamation-3070900/sqlite3.c

8
testframework.sh
View File

@ -844,7 +844,13 @@ _tfw_parse_times_to_milliseconds() {
} }
_tfw_assert() { _tfw_assert() {
if ! "$@"; then local sense=
while [ "$1" = '!' ]; do
sense="$sense !"
shift
done
"$@"
if [ $sense $? -ne 0 ]; then
_tfw_failmsg "assertion failed: ${_tfw_message:-$*}" _tfw_failmsg "assertion failed: ${_tfw_message:-$*}"
_tfw_backtrace _tfw_backtrace
return 1 return 1

4
tests/config
View File

@ -28,7 +28,7 @@ setup() {
doc_GetCreateInstanceDir="Get creates instance directory" doc_GetCreateInstanceDir="Get creates instance directory"
setup_GetCreateInstanceDir() { setup_GetCreateInstanceDir() {
setup setup
assert [ ! -d "$SERVALINSTANCE_PATH" ] assert ! [ -d "$SERVALINSTANCE_PATH" ]
} }
test_GetCreateInstanceDir() { test_GetCreateInstanceDir() {
executeOk_servald config get executeOk_servald config get
@ -38,7 +38,7 @@ test_GetCreateInstanceDir() {
doc_SetCreateInstanceDir="Set creates instance directory" doc_SetCreateInstanceDir="Set creates instance directory"
setup_SetCreateInstanceDir() { setup_SetCreateInstanceDir() {
setup setup
assert [ ! -d "$SERVALINSTANCE_PATH" ] assert ! [ -d "$SERVALINSTANCE_PATH" ]
} }
test_SetCreateInstanceDir() { test_SetCreateInstanceDir() {
executeOk_servald config set foo bar executeOk_servald config set foo bar