You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2012/03/29 16:04:13 UTC

svn commit: r1306871 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Author: danielsh
Date: Thu Mar 29 14:04:13 2012
New Revision: 1306871

URL: http://svn.apache.org/viewvc?rev=1306871&view=rev
Log:
* subversion/tests/cmdline/davautocheck.sh:
   Replace $RANDOM by the Python equivalent from svnserveautocheck.sh.

Modified:
    subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1306871&r1=1306870&r2=1306871&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Thu Mar 29 14:04:13 2012
@@ -255,7 +255,18 @@ LOAD_MOD_AUTHZ_USER="$(get_loadmodule_co
     || fail "Authz_User module not found."
 }
 
-HTTPD_PORT=$(($RANDOM+1024))
+random_port() {
+  if [ -n "$BASH_VERSION" ]; then
+    echo $(($RANDOM+1024))
+  else
+    $PYTHON -c 'import random; print random.randint(1024, 2**16-1)'
+  fi
+}
+
+HTTPD_PORT=$(random_port)
+while netstat -an | grep $SVNSERVE_PORT | grep 'LISTEN'; do
+  HTTPD_PORT=$(random_port)
+done
 HTTPD_ROOT="$ABS_BUILDDIR/subversion/tests/cmdline/httpd-$(date '+%Y%m%d-%H%M%S')"
 HTTPD_CFG="$HTTPD_ROOT/cfg"
 HTTPD_PID="$HTTPD_ROOT/pid"