[Gfarm-commits] SF.net SVN: gfarm: [3444] gfarm/trunk/regress

[<n-...@us...>]

Revision: 3444
          http://gfarm.svn.sourceforge.net/gfarm/?rev=3444&view=rev
Author:   n-soda
Date:     2006-12-25 14:25:42 -0800 (Mon, 25 Dec 2006)

Log Message:
-----------
make it possible to specify diffenrent port number
by the following environment variabes:
$REGRESS_AGENT_PORT
$REGRESS_BACKEND_PORT
$REGRESS_GFMD_PORT
$REGRESS_GFSD_PORT

Modified Paths:
--------------
    gfarm/trunk/regress/README.ja
    gfarm/trunk/regress/config.sh

Modified: gfarm/trunk/regress/README.ja
===================================================================
--- gfarm/trunk/regress/README.ja	2006-12-20 08:31:20 UTC (rev 3443)
+++ gfarm/trunk/regress/README.ja	2006-12-25 22:25:42 UTC (rev 3444)
@@ -345,3 +345,14 @@
      \xBB\xA4\xB7\xA4\xBF\xA4\xA4\xBE\xEC\xB9硢\xB2\xBC\xB5\xAD\xA4Τ褦\xA4ˤ\xB7\xA4ޤ\xB9\xA1\xA3
 	make TEST_TARGET='./tst.sh gfs_hook/tool/scp/scp_from_gfarm.sh' \
 		selfcheck
+
+   \xA1\xA6\xB2\xBC\xB5\xAD\xA4δĶ\xAD\xCAѿ\xF4\xA4\xF2\xC0\xDF\xC4ꤷ\xA4Ƥ\xAA\xA4\xAF\xA4ȡ\xA2\xA5ǥե\xA9\xA5\xEB\xA5ȤȤϰۤʤ\xEB\xA5ݡ\xBC\xA5\xC8\xC8ֹ\xE6\xA4\xF2
+     \xBBȤ\xA6\xA4\xB3\xA4Ȥ\xAC\xA4Ǥ\xAD\xA4ޤ\xB9\xA1\xA3
+	\xB4Ķ\xAD\xCAѿ\xF4		\xA5ǥե\xA9\xA5\xEB\xA5\xC8\xC3\xCD	\xB0\xD5̣
+	$REGRESS_AGENT_PORT	30603		gfarm_agent \xA4Υݡ\xBC\xA5\xC8
+	$REGRESS_BACKEND_PORT	30602		PostgreSQL/OpenLDAP\xA4Υݡ\xBC\xA5\xC8
+	$REGRESS_GFMD_PORT	30601		gfmd \xA4Υݡ\xBC\xA5\xC8
+	$REGRESS_GFSD_PORT	30600		gfsd \xA4Υݡ\xBC\xA5\xC8
+
+
+

Modified: gfarm/trunk/regress/config.sh
===================================================================
--- gfarm/trunk/regress/config.sh	2006-12-20 08:31:20 UTC (rev 3443)
+++ gfarm/trunk/regress/config.sh	2006-12-25 22:25:42 UTC (rev 3444)
@@ -6,10 +6,10 @@
 REGRESS_AUTH=sharedsecret
 agent_enable=false
 agent_only=false
-AGENT_PORT=30603
-BACKEND_PORT=30602
-GFMD_PORT=30601
-GFSD_PORT=30600
+: ${REGRESS_AGENT_PORT:=30603}
+: ${REGRESS_BACKEND_PORT:=30602}
+: ${REGRESS_GFMD_PORT:=30601}
+: ${REGRESS_GFSD_PORT:=30600}
 wait_seconds=3
 
 usage()
@@ -56,14 +56,14 @@
 		shift; true;;
 	-a)	REGRESS_AUTH=${2?"$PROGNAME: -a option requires <auth_type> argument"}
 		shift; true;;
-	-p)	BACKEND_PORT=${2?"$PROGNAME: -p option requires <metadata_backend_port> argument"}
+	-p)	REGRESS_BACKEND_PORT=${2?"$PROGNAME: -p option requires <metadata_backend_port> argument"}
 		shift; true;;
-	-m)	GFMD_PORT=${2?"$PROGNAME: -m option requires <gfmd_port> argument"}
+	-m)	REGRESS_GFMD_PORT=${2?"$PROGNAME: -m option requires <gfmd_port> argument"}
 		shift; true;;
-	-s)	GFSD_PORT=${2?"$PROGNAME: -s option requires <gfsd_port> argument"}
+	-s)	REGRESS_GFSD_PORT=${2?"$PROGNAME: -s option requires <gfsd_port> argument"}
 		shift; true;;
 	--agent-port)
-		AGENT_PORT=${2?"$PROGNAME: --agent-port option requires <agent_port> argument"}
+		REGRESS_AGENT_PORT=${2?"$PROGNAME: --agent-port option requires <agent_port> argument"}
 		shift; true;;
 	--agent-disable) agent_enable=false; true;; # this is default
 	--agent-enable)	 agent_enable=true; true;;
@@ -119,7 +119,8 @@
 set_last_defaults_$REGRESS_BACKEND
 
 config-gfarm --prefix $CONFIG_PREFIX -b $REGRESS_BACKEND $hostname \
-	-a $REGRESS_AUTH -p $BACKEND_PORT -m $GFMD_PORT -s $GFSD_PORT 
+	-a $REGRESS_AUTH -p $REGRESS_BACKEND_PORT \
+	-m $REGRESS_GFMD_PORT -s $REGRESS_GFSD_PORT
 sleep $wait_seconds
 case $REGRESS_AUTH in
 gsi|gsi_auth)
@@ -134,7 +135,7 @@
 	fi;;
 esac
 if $agent_enable; then
-config-agent --prefix $CONFIG_PREFIX -p $AGENT_PORT
+config-agent --prefix $CONFIG_PREFIX -p $REGRESS_AGENT_PORT
 	if $agent_only; then
 		mv	  $CONFIG_PREFIX/etc/gfarm.conf \
 			  $CONFIG_PREFIX/etc/gfarm.conf.org


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.