From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 17 Dec 2014 19:30:39 +0000 (+0000)
Subject: Use SVN revision instead of date, when possible.
X-Git-Tag: v2.2b1~395
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6015e919ce1ab810bf4bf8e6fea1f40ade7c63fa;p=thirdparty%2Fcups.git

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 0ef6fdb7fc..58871d504d 100755
--- 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."