Changeset 6f5ab2a for skype/t/Makefile

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

File:

• skype/t/Makefile (modified) (1 diff)

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;\