[Fedora-directory-commits] dsgw/tests setup.sh,1.5,1.6

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsgw/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21628/dsgw/tests

Modified Files:
	setup.sh 
Log Message:
clean up org chart code - added tests for org chart


Index: setup.sh
===================================================================
RCS file: /cvs/dirsec/dsgw/tests/setup.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup.sh	27 Feb 2008 03:36:51 -0000	1.5
+++ setup.sh	28 Feb 2008 02:49:21 -0000	1.6
@@ -73,6 +73,11 @@
     -e "s#@pbconfigdir@#$sroot/share/dirsrv/dsgw/pbconfig#g" \
     pbconfig/pb.tmpl > testtmp/pb.conf
 
+sed -e "s#@ldapurl@#$ldapurl#g" \
+    -e "s#@suffix@#$suffix#g" \
+    -e "s#@httpurl@#$SERVER_URL#g" \
+    orghtml/orgchart.tmpl > testtmp/orgchart.conf
+
 dir=`pwd`
 
 # CGI env. vars
@@ -100,10 +105,10 @@
 DEBUGCMD=VALGRIND
 #DEBUGCMD="$GDB"
 
-PROGS="lang"
+#PROGS="lang tutor edit search dosearch domodify auth doauth newentry dnedit csearch"
 
 # use scripts for orgchart perl scripts
-SCRIPTS=""
+SCRIPTS="org"
 #ClientLanguage=en_US ; export ClientLanguage
 HTTP_ACCEPT_LANGUAGE=en_US ; export HTTP_ACCEPT_LANGUAGE
 
@@ -234,14 +239,10 @@
         echo "Running test $test"
         REQUEST_METHOD=GET ; export REQUEST_METHOD
         QUERY_STRING="`cat $test`" ; export QUERY_STRING
-        SCRIPT_NAME=slapd/Tasks/Operation/$prog ; export SCRIPT_NAME
-        # open pwpfile for reading as file desc 4 - CGIs have to use stdin (0) for POST
-        exec 4<$pwpfile
-        PASSWORD_PIPE=4 ; export PASSWORD_PIPE
         if [ -n "$DEBUGCMD" -a "$DEBUGCMD" = "$GDB" ] ; then
             perl -d orgchart/$prog
         else
-            perl -w orgchart/$prog
+            perl -w -T -t orgbin/$prog > results/$prog/$basetest.html 2> results/$prog/$basetest.errs
         fi
     done
     rm -f $getlist