[tor-commits] [oonib/master] Grab oonib's pid from the .pid file for the CI test process killer.

[isis@xxxxxxxxxxxxxx]

commit 093ebaa25d28df96be2e54c23bc086009e80c772
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Sun Apr 21 07:56:05 2013 +0000

    Grab oonib's pid from the .pid file for the CI test process killer.
    
     * travis-lint checks out okay:
    (oonib)â??!isisâ?¶wintermute:~/code/torproject/ooni-backend â?´ date
    Sun Apr 21 07:55:19 UTC 2013
    (oonib)â??!isisâ?¶wintermute:~/code/torproject/ooni-backend â?´ travis-lint
    Hooray, /home/isis/code/torproject/ooni-backend/.travis.yml seems to be solid!
---
 .travis.test.sh |    2 +-
 .travis.yml     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.test.sh b/.travis.test.sh
index 8af421d..559b099 100755
--- a/.travis.test.sh
+++ b/.travis.test.sh
@@ -24,7 +24,7 @@ function waitforit () {
 
 waitforit $1& prog=$! ; shift ;
 trap "killitwithfire" ALRM INT
-"$@" & wait $1
+"$@"& wait `cat oonib.pid`
 RET=$?
 kill -ALRM $prog
 wait $prog
diff --git a/.travis.yml b/.travis.yml
index ac0bd29..8d7a00e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,5 @@ script:
   - openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt
   - test -f "private.key.org" && rm -f private.key.org
   - test -f "server.csr" && rm -f server.csr
-  - chmod +x .travis.test.sh && ./.travis.test.sh 30 bin/oonib
+  - chmod +x .travis.test.sh && ./.travis.test.sh 30 ./bin/oonib
+  - echo "Build successful."



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits