Use SVN revision instead of date, when possible.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12373 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 0ef6fdb7fc070b199eae14d4bd692426e690b57c..58871d504db85d24751bf5e00ab6cbb8508d35f6 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -714,7 +714,13 @@ done
 #
 
 date=`date "+%Y-%m-%d"`
-strfile=$BASE/cups-str-2.1-$date-$user.html
+
+if test -d $root/.svn; then
+       rev=`svn info . | grep Revision: | awk '{print $2}'`
+       strfile=$BASE/cups-str-2.1-r$rev-$user.html
+else
+       strfile=$BASE/cups-str-2.1-$date-$user.html
+fi
 
 rm -f $strfile
 cat str-header.html >$strfile
@@ -1067,7 +1073,13 @@ echo ""
 
 if test $fail != 0; then
        echo "$fail tests failed."
-       cp $BASE/log/error_log error_log-$date-$user
+
+       if test -d $root/.svn; then
+               cp $BASE/log/error_log error_log-r$rev-$user
+       else
+               cp $BASE/log/error_log error_log-$date-$user
+       fi
+
        cp $strfile .
 else
        echo "All tests were successful."