Skip to content

Commit

Permalink
some testscript cleanups; add travis-ci configuration. Thanks Kees&Ru…
Browse files Browse the repository at this point in the history
…ben. Closes PowerDNS#730

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3151 d19b8d6e-7fed-0310-83ef-9ca221ded41b
  • Loading branch information
Peter van Dijk committed Apr 8, 2013
1 parent eedb8b1 commit 7b8f4fc
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 3 deletions.
35 changes: 35 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
language: cpp
compiler:
- gcc
before_script:
- sudo apt-get update -qq
- sudo apt-get install -qq libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl ldnsutils dnsutils
script:
- ./bootstrap
- ./configure --with-modules='gmysql' --with-sqlite3
- make -j 4
- cd regression-tests
- touch verify-dnssec-zone/skip
- ./start-test-stop 5300 bind
- ./start-test-stop 5300 bind-presigned
- ./start-test-stop 5300 bind-dnssec
- ./start-test-stop 5300 bind-dnssec-presigned
- ./start-test-stop 5300 bind-dnssec-nsec3
- ./start-test-stop 5300 bind-dnssec-nsec3-presigned
- ./start-test-stop 5300 bind-dnssec-nsec3-optout
- ./start-test-stop 5300 bind-dnssec-nsec3-optout-presigned
- ./start-test-stop 5300 gmysql-nodnssec
- ./start-test-stop 5300 gmysql-nodnssec-presigned
- ./start-test-stop 5300 gmysql
- ./start-test-stop 5300 gmysql-presigned
- ./start-test-stop 5300 gmysql-nsec3
- ./start-test-stop 5300 gmysql-nsec3-presigned
- ./start-test-stop 5300 gmysql-nsec3-optout
- ./start-test-stop 5300 gmysql-nsec3-optout-presigned
- ./start-test-stop 5300 gmysql-nsec3-narrow
notifications:
irc:
channels:
- "irc.oftc.net#powerdns-dev"
use_notice: true
skip_join: true
2 changes: 1 addition & 1 deletion regression-tests/00dnssec-grabkeys/command
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
set pipefail
rm -f trustedkeys
rm -f unbound-host.conf
Expand Down
4 changes: 2 additions & 2 deletions regression-tests/cleandig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
if [ ! -f ${testsdir}/${testname}/use.drill ]
if [ ! -e ${testsdir}/${testname}/use.drill ]
then
../pdns/sdig $nameserver $port $1 $2 $3 | LC_ALL=C sort
fi
Expand All @@ -18,7 +18,7 @@ then
unbound-host -v -C unbound-host.conf -t $2 $1 > ${testsdir}/${testname}/unbound-host.out 2>&1
echo RETVAL: $? >> ${testsdir}/${testname}/unbound-host.out
fi
if [ -f ${testsdir}/${testname}/use.drill ]
if [ -e ${testsdir}/${testname}/use.drill ]
then
cat ${testsdir}/${testname}/drill.out
fi
Expand Down
10 changes: 10 additions & 0 deletions regression-tests/start-test-stop
Original file line number Diff line number Diff line change
Expand Up @@ -593,3 +593,13 @@ then
fi
kill $(cat pdns*.pid)
rm pdns*.pid

if [ -s "./failed_tests" ]
then
for t in `cat failed_tests`
do
echo $t
cat $t/diff
done
exit 1
fi

0 comments on commit 7b8f4fc

Please sign in to comment.