Commit dd06f06e authored by Tristan Matthews's avatar Tristan Matthews

Merge branch 'master' of...

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into fix_cppcheck_warnings
parents c111dfa0 00126a36
......@@ -10,6 +10,9 @@ BUILD=
CODE_ANALYSIS=0
DOXYGEN=0
CONFIGDIR=~/.config
SFLCONFDIR=${CONFIGDIR}/sflphone
function run_code_analysis {
# Check if cppcheck is installed on the system
if [ `which cppcheck &>/dev/null ; echo $?` -ne 1 ] ; then
......@@ -19,6 +22,7 @@ function run_code_analysis {
fi
}
function gen_doxygen {
# Check if doxygen is installed on the system
if [ `which doxygen &>/dev/null ; echo $?` -ne 1 ] ; then
......@@ -28,6 +32,58 @@ function gen_doxygen {
fi
}
function launch_unit_test_daemon {
# Run the unit tests for the daemon
pushd daemon/test
# Remove the previous XML test file
rm -rf $XML_RESULTS
./run_tests.sh || exit 1
popd
}
function launch_functional_test_daemon {
# Run the python functional tests for the daemon
# make sure no other instance are currently running
killall sflphoned
killall sipp
# make sure the configuration directory created
CONFDIR=~/.config
SFLCONFDIR=${CONFDIR}/sflphone
eval `dbus-launch --auto-syntax`
if [ ! -d ${CONFDIR} ]; then
mkdir ${CONFDIR}
fi
if [ ! -d ${SFLCONFDIR} ]; then
mkdir ${SFLCONFDIR}
fi
# make sure the most recent version of the configuration
# is installed
pushd tools/pysflphone
cp -f sflphoned.functest.yml ${SFLCONFDIR}
popd
# launch sflphone daemon, wait some time for
# dbus registration to complete
pushd daemon
./src/sflphoned &
sleep 3
popd
# launch the test script
pushd tools/pysflphone
nosetests --with-xunit test_sflphone_dbus_interface.py
popd
}
function build_daemon {
# Compile the daemon
pushd daemon
......@@ -55,15 +111,6 @@ function build_daemon {
# Compile unit tests
make check
popd
if [ $TEST == 1 ]; then
# Run the unit tests for the daemon
pushd daemon/test
# Remove the previous XML test file
rm -rf $XML_RESULTS
./run_tests.sh || exit 1
popd
fi
}
function build_gnome {
......@@ -128,5 +175,10 @@ done
# Call appropriate build function, with parameters if needed
build_$BUILD
if [ $TEST == 1 ]; then
# launch_unit_test_daemon
launch_functional_test_daemon
fi
# SUCCESS
exit 0
---
accounts:
- alias: 100
codecs: 0/3/8/9/110/111/112/
credential:
- Account.password: password
Account.realm: '*'
Account.username: 100
displayName:
dtmfType: overrtp
enable: true
hostname: 127.0.0.1:5062
id: Account:1334024061
interface: default
mailbox:
port: 5060
publishAddr: 0.0.0.0
publishPort: 5060
registrationexpire: 600
ringtoneEnabled: true
ringtonePath: /home/alexandresavard/Development/sflphone/gnome
sameasLocal: true
serviceRoute:
srtp:
enable: false
keyExchange:
rtpFallback: false
stunEnabled: false
stunServer: stun.sflphone.org
tls:
calist:
certificate:
ciphers:
enable: false
method: TLSv1
password:
privateKey:
requireCertif: true
server:
timeout: 2
tlsPort: 5061
verifyClient: true
verifyServer: true
type: SIP
updateContact: false
username: 100
zrtp:
displaySas: true
displaySasOnce: false
helloHashEnabled: true
notSuppWarning: true
- alias: 200
codecs: 0/3/8/9/110/111/112/
credential:
- Account.password: password
Account.realm: '*'
Account.username: 200
displayName:
dtmfType: overrtp
enable: true
hostname: 127.0.0.1:5062
id: Account:1334024356
interface: default
mailbox:
port: 5060
publishAddr: 0.0.0.0
publishPort: 5060
registrationexpire: 600
ringtoneEnabled: true
ringtonePath: /home/alexandresavard/Development/sflphone/gnome
sameasLocal: true
serviceRoute:
srtp:
enable: false
keyExchange:
rtpFallback: false
stunEnabled: false
stunServer: stun.sflphone.org
tls:
calist:
certificate:
ciphers:
enable: false
method: TLSv1
password:
privateKey:
requireCertif: true
server:
timeout: 2
tlsPort: 5061
verifyClient: true
verifyServer: true
type: SIP
updateContact: false
username: 200
zrtp:
displaySas: true
displaySasOnce: false
helloHashEnabled: true
notSuppWarning: true
- alias:
codecs: 0/3/8/9/110/111/112/
credential:
- Account.password:
Account.realm: '*'
Account.username:
displayName:
dtmfType: overrtp
enable: true
hostname:
id: IP2IP
interface: default
mailbox:
port: 5060
publishAddr:
publishPort: 5060
registrationexpire: 600
ringtoneEnabled: true
ringtonePath: /usr/share/sflphone/ringtones/konga.ul
sameasLocal: true
serviceRoute:
srtp:
enable: false
keyExchange: sdes
rtpFallback: false
stunEnabled: false
stunServer: stun.sflphone.org
tls:
calist:
certificate:
ciphers:
enable: false
method: TLSv1
password:
privateKey:
requireCertif: true
server:
timeout: 2
tlsPort: 5061
verifyClient: true
verifyServer: true
type: SIP
updateContact: false
username:
zrtp:
displaySas: true
displaySasOnce: false
helloHashEnabled: true
notSuppWarning: true
preferences:
historyLimit: 30
historyMaxCalls: 20
md5Hash: false
notifyMails: false
order: Account:1334024356/Account:1334024061/
portNum: 5060
registrationexpire: 180
searchBarDisplay: true
zeroConfenable: false
zoneToneChoice: North America
voipPreferences:
playDtmf: true
playTones: true
pulseLength: 250
symmetric: true
zidFile: true
addressbook:
business: true
enabled: true
home: true
list:
maxResults: 25
mobile: true
photo: true
hooks:
iax2Enabled: false
numberAddPrefix:
numberEnabled: false
sipEnabled: false
urlCommand: x-www-browser
urlSipField: X-sflphone-url
audio:
alsa:
cardIn: 0
cardOut: 0
cardRing: 0
plugin: default
smplRate: 44100
alwaysRecording: false
audioApi: pulseaudio
echoCancel: false
echoDelayLength: 0
echoTailLength: 100
noiseReduce: true
pulse:
devicePlayback: alsa_output.pci-0000_00_1b.0.analog-stereo
deviceRecord: alsa_input.pci-0000_00_1b.0.analog-stereo
deviceRingtone: alsa_output.pci-0000_00_1b.0.analog-stereo
recordPath:
volumeMic: 100
volumeSpkr: 100
shortcuts:
hangUp:
pickUp:
popupWindow:
toggleHold:
togglePickupHangup:
...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment