Fix search template width.

"make test" now creates a runcups test script which runs command against
test server.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7954 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/templates/search.tmpl b/templates/search.tmpl
index 0fcc43861ff8f520d5e108aa67a63b0ae41feb60..9e05e6ecb5d0380843fe2dfee2015fbe1ab4f87b 100644 (file)
--- a/templates/search.tmpl
+++ b/templates/search.tmpl
@@ -4,7 +4,7 @@
 
 <P ALIGN="CENTER"><B>Search in
 {SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Classes:{SECTION=jobs?Jobs:Printers}}}:</B>
-<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
+<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
 TYPE="SUBMIT" VALUE="Search"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Clear"></P>
 
 </FORM>

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 4afa5ab98e83566d31bebbdbe145eef3b1c9093d..a0683a6027c853f97cc04532d76ee93d1d994359 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -230,6 +230,7 @@ mkdir /tmp/cups-$user/spool
 mkdir /tmp/cups-$user/spool/temp
 mkdir /tmp/cups-$user/ssl
 
+ln -s $root/backend/dnssd /tmp/cups-$user/bin/backend
 ln -s $root/backend/http /tmp/cups-$user/bin/backend
 ln -s $root/backend/ipp /tmp/cups-$user/bin/backend
 ln -s $root/backend/lpd /tmp/cups-$user/bin/backend
@@ -416,7 +417,7 @@ fi
 
 export SHLIB_PATH
 
-CUPS_SERVER=localhost; export CUPS_SERVER
+CUPS_SERVER=localhost:8631; export CUPS_SERVER
 CUPS_SERVERROOT=/tmp/cups-$user; export CUPS_SERVERROOT
 CUPS_STATEDIR=/tmp/cups-$user; export CUPS_STATEDIR
 CUPS_DATADIR=/tmp/cups-$user/share; export CUPS_DATADIR
@@ -448,10 +449,34 @@ $valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/l
 cupsd=$!
 
 if test "x$testtype" = x0; then
+       # Not running tests...
        echo "Scheduler is PID $cupsd and is listening on port 8631."
        echo ""
-       echo "Set the IPP_PORT environment variable to 8631 to test the software"
-       echo "interactively from the command-line."
+
+       # Create a helper script to run programs with...
+       runcups="/tmp/cups-$user/runcups"
+
+       echo "#!/bin/sh" >$runcups
+       echo "# Helper script for running CUPS test instance." >>$runcups
+       echo "" >>$runcups
+       echo "# Set required environment variables..." >>$runcups
+       echo "CUPS_DATADIR=\"$CUPS_DATADIR\"; export CUPS_DATADIR" >>$runcups
+       echo "CUPS_SERVER=\"$CUPS_SERVER\"; export CUPS_SERVER" >>$runcups
+       echo "CUPS_SERVERROOT=\"$CUPS_SERVERROOT\"; export CUPS_SERVERROOT" >>$runcups
+       echo "CUPS_STATEDIR=\"$CUPS_STATEDIR\"; export CUPS_STATEDIR" >>$runcups
+       echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$runcups
+       echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+       echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+       echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+       echo "SHLIB_PATH=\"$SHLIB_PATH\"; export SHLIB_PATH" >>$runcups
+       echo "" >>$runcups
+       echo "# Run command..." >>$runcups
+       echo "exec \"\$@\"" >>$runcups
+
+       chmod +x $runcups
+
+       echo "The $runcups helper script can be used to test programs"
+       echo "with the server."
        exit 0
 fi