Skip to content

Commit 129de34

Browse files
committed
Merge branch 'master' into v1.10
2 parents f7bdd38 + 50b7ded commit 129de34

File tree

1,201 files changed

+109101
-56325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,201 files changed

+109101
-56325
lines changed

.drone.yml

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,30 @@
22
kind: pipeline
33
name: unit-tests
44

5+
node:
6+
freeswitch: public
7+
58
steps:
69
- name: run-tests
710
image: signalwire/freeswitch-public-base
811
pull: true
912
commands:
13+
- cat /proc/sys/kernel/core_pattern
1014
- ./bootstrap.sh -j
1115
- echo "applications/mod_test" >> modules.conf
12-
- ./configure
16+
- sed -i '/applications\/mod_http_cache/s/^#//g' modules.conf
17+
- sed -i '/event_handlers\/mod_rayo/s/^#//g' modules.conf
18+
- sed -i '/formats\/mod_opusfile/s/^#//g' modules.conf
19+
- sed -i '/languages\/mod_lua/s/^#//g' modules.conf
20+
- export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1;
21+
- ./configure --enable-address-sanitizer
1322
- echo "#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=\${PIPESTATUS[0]}\necho \$exitstatus > ./build-status.txt\nmake install\n" > build.sh
1423
- chmod +x build.sh
1524
- ./build.sh
1625
- cd tests/unit
1726
- ./run-tests.sh
18-
- mkdir logs && (mv log_run-tests_*.html logs || true)
27+
- ls -la /cores
28+
- mkdir logs && (mv log_run-tests_*.html logs || true) && (mv backtrace_*.txt logs || true)
1929
- echo 0 > run-tests-status.txt
2030
- ./collect-test-logs.sh && exit 0 || echo 'Some tests failed'
2131
- echo 1 > run-tests-status.txt
@@ -40,8 +50,73 @@ trigger:
4050
event:
4151
- pull_request
4252
- push
53+
54+
---
55+
kind: pipeline
56+
name: scan-build
57+
58+
node:
59+
freeswitch: public
60+
61+
steps:
62+
- name: scan-build
63+
image: signalwire/freeswitch-public-base:stretch
64+
pull: true
65+
commands:
66+
- ./bootstrap.sh -j
67+
- cp build/modules.conf.most modules.conf
68+
#Enable/Uncomment mods
69+
- sed -i "/mod_mariadb/s/^#//g" modules.conf
70+
- sed -i "/mod_v8/s/^#//g" modules.conf
71+
#Disable/Comment out mods
72+
- sed -i '/mod_ilbc/s/^/#/g' modules.conf
73+
- sed -i '/mod_isac/s/^/#/g' modules.conf
74+
- sed -i '/mod_mp4/s/^/#/g' modules.conf
75+
- sed -i '/mod_mongo/s/^/#/g' modules.conf
76+
- sed -i '/mod_pocketsphinx/s/^/#/g' modules.conf
77+
- sed -i '/mod_sangoma_codec/s/^/#/g' modules.conf
78+
- sed -i '/mod_siren/s/^/#/g' modules.conf
79+
#Comment out mods for a while
80+
- sed -i '/mod_avmd/s/^/#/g' modules.conf
81+
- sed -i '/mod_basic/s/^/#/g' modules.conf
82+
- sed -i '/mod_cdr_mongodb/s/^/#/g' modules.conf
83+
- sed -i '/mod_cv/s/^/#/g' modules.conf
84+
- sed -i '/mod_erlang_event/s/^/#/g' modules.conf
85+
- sed -i '/mod_perl/s/^/#/g' modules.conf
86+
- sed -i '/mod_rtmp/s/^/#/g' modules.conf
87+
- sed -i '/mod_unimrcp/s/^/#/g' modules.conf
88+
- sed -i '/mod_xml_rpc/s/^/#/g' modules.conf
89+
- ./configure
90+
- mkdir -p scan-build
91+
- echo "#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=\${PIPESTATUS[0]}\necho \$exitstatus > ./scan-build-status.txt\n" > scan.sh
92+
- chmod +x scan.sh
93+
- ./scan.sh
94+
- exitstatus=`cat ./scan-build-status.txt`
95+
- echo "*** Exit status is $exitstatus"
96+
97+
- name: notify
98+
image: signalwire/scan-build-notify
99+
pull: true
100+
environment:
101+
GITHUB_CI_APP_PEM:
102+
from_secret: github_ci_app_pem
103+
SSH_KEY:
104+
from_secret: ssh_key
105+
SLACK_WEBHOOK_URL:
106+
from_secret: slack_webhook_url
107+
commands:
108+
- /root/notify.sh
109+
110+
111+
trigger:
112+
branch:
113+
- master
114+
event:
115+
- pull_request
116+
- push
117+
43118
---
44119
kind: signature
45-
hmac: a34718dd1e2b9468a845962219ff05cac0c922ddf90d885af557a937a9e412e0
120+
hmac: d354f6d232ae6417b539fb9b40fc15765c3247ab58c87a5135a0ac6c448e1cd0
46121

47122
...

.gitconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This repository contains two commits with multiple authors.
2+
3+
# By default, fsck will show errors for those commits.
4+
# Run the following command to ignore them:
5+
6+
# git config --local include.path ../.gitconfig
7+
8+
[fsck]
9+
multipleAuthors=ignore

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,11 @@ src/mod/applications/mod_http_cache/test/test-suite.log
271271
src/mod/applications/mod_http_cache/test/test_aws
272272
src/mod/applications/mod_http_cache/test/test_aws.log
273273
src/mod/applications/mod_http_cache/test/test_aws.trs
274-
274+
src/mod/formats/mod_sndfile/test/test_sndfile
275+
src/mod/formats/mod_sndfile/test/test_sndfile_conf
276+
src/mod/*/*/test/*.log
277+
src/mod/*/*/test/*.trs
278+
src/mod/*/*/test/[0-9]*/*
279+
test-suite.log
280+
src/mod/applications/mod_av/test/test_BT7.mp4
281+
src/mod/applications/mod_av/test/test_RGB.mp4

Makefile.am

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,8 @@ $(switch_builddir)/modules.conf:
547547
src/mod/modules.inc: $(switch_builddir)/modules.conf
548548
@echo "OUR_MODULES=$(OUR_MODS)" > $(switch_builddir)/src/mod/modules.inc
549549
@echo "OUR_CLEAN_MODULES=$(OUR_CLEAN_MODS)" >> $(switch_builddir)/src/mod/modules.inc
550+
@echo "OUR_TEST_MODULES=$(OUR_TEST_MODS)" >> $(switch_builddir)/src/mod/modules.inc
551+
@echo "OUR_CHECK_MODULES=$(OUR_CHECK_MODS)" >> $(switch_builddir)/src/mod/modules.inc
550552
@echo "OUR_INSTALL_MODULES=$(OUR_INSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
551553
@echo "OUR_UNINSTALL_MODULES=$(OUR_UNINSTALL_MODS)" >> $(switch_builddir)/src/mod/modules.inc
552554
@echo "OUR_DISABLED_MODULES=$(OUR_DISABLED_MODS)" >> $(switch_builddir)/src/mod/modules.inc
@@ -848,6 +850,10 @@ modclean: $(switch_builddir)/modules.conf src/mod/modules.inc
848850
modwipe:
849851
rm -f $(modulesdir)/*.so $(modulesdir)/*.la $(modulesdir)/*.dll $(modulesdir)/*.dylib
850852

853+
print_tests: libfreeswitch.la $(switch_builddir)/modules.conf src/mod/modules.inc
854+
@cd tests/unit && $(MAKE) $(AM_MAKEFLAGS) print_tests
855+
@cd src/mod && $(MAKE) $(AM_MAKEFLAGS) print_tests
856+
851857
dox:
852858
cd docs && doxygen $(PWD)/docs/Doxygen.conf
853859

build/modmake.rules.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ install-modules: all-modules depend_install local_install mod_install
107107
uninstall-modules: local_uninstall mod_uninstall
108108
distclean-modules: clean-modules local_distclean
109109
extraclean-modules: distclean local_extraclean
110+
print_tests:
110111

111112
Makefile:
112113
@if test ! -f $@; then \
@@ -270,4 +271,4 @@ $(switch_srcdir)/src/include/switch_xml.h:
270271
.PHONY: all clean depend install distclean extraclean \
271272
all-modules clean-modules depend-modules install-modules distclean-modules extraclean-modules \
272273
local_all local_clean local_depend local_install local_distclean local_extraclean \
273-
mod_clean mod_install mod_uninstall depend_install
274+
mod_clean mod_install mod_uninstall depend_install print_tests

build/modmake.rulesam

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ install-modules: install
1414
uninstall-modules: uninstall
1515
distclean-modules: distclean
1616
extraclean-modules: extraclean
17+
18+
print_tests:
19+
@set +e; \
20+
test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done;
21+

build/next-release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.2-release
1+
1.10.3-release
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<configuration name="sndfile.conf">
2+
<settings>
3+
<!-- Allow only these file extensions. Default: allow all sndfile provided extensions + FS custom extra -->
4+
<!--
5+
<param name="allowed-extensions" value="wav,raw,r8,r16"/>
6+
-->
7+
</settings>
8+
</configuration>
9+

conf/testing/autoload_configs/switch.conf.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@
190190

191191
<!-- Allow multiple registrations to the same account in the central registration table -->
192192
<!-- <param name="multiple-registrations" value="true"/> -->
193-
193+
194+
<!-- <param name="max-audio-channels" value="2"/> -->
195+
194196
</settings>
195197

196198
</configuration>

conf/vanilla/autoload_configs/httapi.conf.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@
105105
<!-- <param name="ssl-key-password" value="MyPrivateKeyPassword"/> -->
106106
<!-- optional timeout -->
107107
<!-- <param name="timeout" value="10"/> -->
108+
<!-- optional: maximum amount of time in seconds that is allowed to make the connection to the server -->
109+
<!-- <param name="connect-timeout" value="2"/> -->
108110

109111
<!-- optional: use a custom CA certificate in PEM format to verify the peer
110112
with. This is useful if you are acting as your own certificate authority.

0 commit comments

Comments
 (0)