Changeset 6f5ab2a

Timestamp:

2011-01-04T00:06:46Z (14 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:

• Makefile (modified) (1 diff)
• irssi/livetest-irssi.sh (modified) (2 diffs)
• livetest-bitlbee.sh (modified) (3 diffs)

skype/t/Makefile

@@ -15 +15 @@
 $(tests): % : %.test
         @echo "--- Running test $@ ---"; \
-                if ! ./livetest-bitlbee.sh $(BITLBEE) $(PORT) irssi/livetest-irssi.sh $< >$@.log; then \
+                if [ -r "$(BITLBEE)" -a -x "$(BITLBEE)" ]; then \
+                        bitlbee_binary="$(BITLBEE)"; \
+                else \
+                        bitlbee_basename=`basename $(BITLBEE)`; \
+                        bitlbee_binary=`which $$bitlbee_basename`; \
+                fi; \
+                if ! ./livetest-bitlbee.sh "$$bitlbee_binary" $(PORT) irssi/livetest-irssi.sh $< >$@.log; then \
                         echo Test failed, log: ;\
                         cat $@.log;\

skype/t/irssi/livetest-irssi.sh

@@ -1 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ISCRIPT=$1
 OPT=$2
@@ -79 +79 @@
 
 submitlogs() {
-        sed -i -e "s/$TESTLOGIN/---TESTLOGIN---/;s/$TESTPASSWORD/---TESTPASSWORD---/" dotirssi/logs/*.log
+        perl -p -i -e "s/$TESTLOGIN/---TESTLOGIN---/;s/$TESTPASSWORD/---TESTPASSWORD---/" dotirssi/logs/*.log
 
         if [ "$OPT" == "tgz" ]; then

skype/t/livetest-bitlbee.sh

@@ -1 @@
-#!/bin/bash
+#!/usr/bin/env bash
 BITLBEE=$1
 typeset -ix PORT=`echo $2 | egrep '^[0-9]{1,5}$'`
@@ -18 +18 @@
 kill -0 `cat bitlbeetest.pid 2>/dev/null ` 2>/dev/null || { echo Failed to run bitlbee daemon on port $PORT; exit 1; }
 
-# Set up skyped
+if [ -z "$TUNNELED_MODE" ]; then
+        # Set up skyped
 
-rm -rf etc
-mkdir etc
-cd etc
-cp ../../skyped.cnf .
-cp ~/.skyped/skyped.cert.pem .
-cp ~/.skyped/skyped.key.pem .
-cd ..
-echo "[skyped]" > skyped.conf
-echo "username = $TEST_SKYPE_ID" >> skyped.conf
-echo "password = $(echo -n $TEST_SKYPE_PASSWORD|sha1sum|sed 's/ *-$//')" >> skyped.conf
-# we use ~ here to test that resolve that syntax works
-echo "cert = $(pwd|sed "s|$HOME|~|")/etc/skyped.cert.pem" >> skyped.conf
-echo "key = $(pwd|sed "s|$HOME|~|")/etc/skyped.key.pem" >> skyped.conf
-echo "port = 2727" >> skyped.conf
+        rm -rf etc
+        mkdir etc
+        cd etc
+        cp ../../skyped.cnf .
+        cp ~/.skyped/skyped.cert.pem .
+        cp ~/.skyped/skyped.key.pem .
+        cd ..
+        echo "[skyped]" > skyped.conf
+        echo "username = $TEST_SKYPE_ID" >> skyped.conf
+        SHA1=`which sha1sum`
+        if [ -z "$SHA1" ]; then
+                SHA1=`which sha1`
+        fi
+        if [ -z "$SHA1" ]; then
+                echo Test failed
+                echo "(Can't compute password for skyped.conf)"
+                exit 77
+        fi
+        echo "password = $(echo -n $TEST_SKYPE_PASSWORD|$SHA1|sed 's/ *-$//')" >> skyped.conf
+        # we use ~ here to test that resolve that syntax works
+        echo "cert = $(pwd|sed "s|$HOME|~|")/etc/skyped.cert.pem" >> skyped.conf
+        echo "key = $(pwd|sed "s|$HOME|~|")/etc/skyped.key.pem" >> skyped.conf
+        echo "port = 2727" >> skyped.conf
 
-# Run skyped
-python ../skyped.py -c skyped.conf -l skypedtest.log > skypedtest.pid
-sleep 2
+        # Run skyped
+        python ../skyped.py -c skyped.conf -l skypedtest.log > skypedtest.pid
+        sleep 2
+fi
+
+if [ "$TUNNELED_MODE" = "yes" ]; then
+        rm -f tunnel.pid
+        if [ -n "$TUNNEL_SCRIPT" ]; then
+                $TUNNEL_SCRIPT &
+                echo $! > tunnel.pid
+                sleep 5
+        fi
+fi
 
 # Run the test
@@ -44 +64 @@
 RET=$?
 
-# Kill skyped
-killall -TERM skype
-kill -TERM $(sed 's/.*: //' skypedtest.pid)
+if [ -z "$TUNNELED_MODE" ]; then
+        # skyped runs on another host: no means to kill it
+        # Kill skyped
+        killall -TERM skype
+        kill -TERM $(sed 's/.*: //' skypedtest.pid)
+fi
+
+if [ "$TUNNELED_MODE" = "yes" ]; then
+        if [ -n "$TUNNEL_SCRIPT" ]; then
+                cat tunnel.pid >> /tmp/tunnel.pid
+                kill `cat tunnel.pid`
+                rm -f tunnel.pid
+        fi
+fi
 
 # Kill bee
 echo Killing bitlbee...
 kill `cat bitlbeetest.pid`
+
+if [ "$TUNNELED_MODE" = "yes" ]; then
+        # give the skyped a chance to timeout
+        sleep 30
+fi
 
 # Return test result