Changeset 6f5ab2a


Ignore:
Timestamp:
2011-01-04T00:06:46Z (8 years ago)
Author:
Miklos Vajna <vmiklos@…>
Branches:
master
Children:
c12a5c8
Parents:
bb0775c (diff), dc3f9ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'portable-NetBSD-tests' of git://github.com/pcrama/bitlbee-skype

Location:
skype/t
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • skype/t/Makefile

    rbb0775c r6f5ab2a  
    1515$(tests): % : %.test
    1616        @echo "--- Running test $@ ---"; \
    17                 if ! ./livetest-bitlbee.sh $(BITLBEE) $(PORT) irssi/livetest-irssi.sh $< >$@.log; then \
     17                if [ -r "$(BITLBEE)" -a -x "$(BITLBEE)" ]; then \
     18                        bitlbee_binary="$(BITLBEE)"; \
     19                else \
     20                        bitlbee_basename=`basename $(BITLBEE)`; \
     21                        bitlbee_binary=`which $$bitlbee_basename`; \
     22                fi; \
     23                if ! ./livetest-bitlbee.sh "$$bitlbee_binary" $(PORT) irssi/livetest-irssi.sh $< >$@.log; then \
    1824                        echo Test failed, log: ;\
    1925                        cat $@.log;\
  • skype/t/irssi/livetest-irssi.sh

    rbb0775c r6f5ab2a  
    1 #!/bin/bash
     1#!/usr/bin/env bash
    22ISCRIPT=$1
    33OPT=$2
     
    7979
    8080submitlogs() {
    81         sed -i -e "s/$TESTLOGIN/---TESTLOGIN---/;s/$TESTPASSWORD/---TESTPASSWORD---/" dotirssi/logs/*.log
     81        perl -p -i -e "s/$TESTLOGIN/---TESTLOGIN---/;s/$TESTPASSWORD/---TESTPASSWORD---/" dotirssi/logs/*.log
    8282
    8383        if [ "$OPT" == "tgz" ]; then
  • skype/t/livetest-bitlbee.sh

    rbb0775c r6f5ab2a  
    1 #!/bin/bash
     1#!/usr/bin/env bash
    22BITLBEE=$1
    33typeset -ix PORT=`echo $2 | egrep '^[0-9]{1,5}$'`
     
    1818kill -0 `cat bitlbeetest.pid 2>/dev/null ` 2>/dev/null || { echo Failed to run bitlbee daemon on port $PORT; exit 1; }
    1919
    20 # Set up skyped
     20if [ -z "$TUNNELED_MODE" ]; then
     21        # Set up skyped
    2122
    22 rm -rf etc
    23 mkdir etc
    24 cd etc
    25 cp ../../skyped.cnf .
    26 cp ~/.skyped/skyped.cert.pem .
    27 cp ~/.skyped/skyped.key.pem .
    28 cd ..
    29 echo "[skyped]" > skyped.conf
    30 echo "username = $TEST_SKYPE_ID" >> skyped.conf
    31 echo "password = $(echo -n $TEST_SKYPE_PASSWORD|sha1sum|sed 's/ *-$//')" >> skyped.conf
    32 # we use ~ here to test that resolve that syntax works
    33 echo "cert = $(pwd|sed "s|$HOME|~|")/etc/skyped.cert.pem" >> skyped.conf
    34 echo "key = $(pwd|sed "s|$HOME|~|")/etc/skyped.key.pem" >> skyped.conf
    35 echo "port = 2727" >> skyped.conf
     23        rm -rf etc
     24        mkdir etc
     25        cd etc
     26        cp ../../skyped.cnf .
     27        cp ~/.skyped/skyped.cert.pem .
     28        cp ~/.skyped/skyped.key.pem .
     29        cd ..
     30        echo "[skyped]" > skyped.conf
     31        echo "username = $TEST_SKYPE_ID" >> skyped.conf
     32        SHA1=`which sha1sum`
     33        if [ -z "$SHA1" ]; then
     34                SHA1=`which sha1`
     35        fi
     36        if [ -z "$SHA1" ]; then
     37                echo Test failed
     38                echo "(Can't compute password for skyped.conf)"
     39                exit 77
     40        fi
     41        echo "password = $(echo -n $TEST_SKYPE_PASSWORD|$SHA1|sed 's/ *-$//')" >> skyped.conf
     42        # we use ~ here to test that resolve that syntax works
     43        echo "cert = $(pwd|sed "s|$HOME|~|")/etc/skyped.cert.pem" >> skyped.conf
     44        echo "key = $(pwd|sed "s|$HOME|~|")/etc/skyped.key.pem" >> skyped.conf
     45        echo "port = 2727" >> skyped.conf
    3646
    37 # Run skyped
    38 python ../skyped.py -c skyped.conf -l skypedtest.log > skypedtest.pid
    39 sleep 2
     47        # Run skyped
     48        python ../skyped.py -c skyped.conf -l skypedtest.log > skypedtest.pid
     49        sleep 2
     50fi
     51
     52if [ "$TUNNELED_MODE" = "yes" ]; then
     53        rm -f tunnel.pid
     54        if [ -n "$TUNNEL_SCRIPT" ]; then
     55                $TUNNEL_SCRIPT &
     56                echo $! > tunnel.pid
     57                sleep 5
     58        fi
     59fi
    4060
    4161# Run the test
     
    4464RET=$?
    4565
    46 # Kill skyped
    47 killall -TERM skype
    48 kill -TERM $(sed 's/.*: //' skypedtest.pid)
     66if [ -z "$TUNNELED_MODE" ]; then
     67        # skyped runs on another host: no means to kill it
     68        # Kill skyped
     69        killall -TERM skype
     70        kill -TERM $(sed 's/.*: //' skypedtest.pid)
     71fi
     72
     73if [ "$TUNNELED_MODE" = "yes" ]; then
     74        if [ -n "$TUNNEL_SCRIPT" ]; then
     75                cat tunnel.pid >> /tmp/tunnel.pid
     76                kill `cat tunnel.pid`
     77                rm -f tunnel.pid
     78        fi
     79fi
    4980
    5081# Kill bee
    5182echo Killing bitlbee...
    5283kill `cat bitlbeetest.pid`
     84
     85if [ "$TUNNELED_MODE" = "yes" ]; then
     86        # give the skyped a chance to timeout
     87        sleep 30
     88fi
    5389
    5490# Return test result
Note: See TracChangeset for help on using the changeset viewer.