Author: esr
Date: Tue Apr 24 15:09:09 2007
New Revision: 17031
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17031&view=rev
Log:
Make rge regression report much less verbose.
Modified:
trunk/data/tools/regress
Modified: trunk/data/tools/regress
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/regress?rev=17031&r1=17030&r2=17031&view=diff
==============================================================================
--- trunk/data/tools/regress (original)
+++ trunk/data/tools/regress Tue Apr 24 15:09:09 2007
@@ -7,33 +7,32 @@
UMC=../../umc
TERRAIN=../terrain.cfg
-cleanup() {
- find $UMC -type f -regex '.*-p[ly]' -exec rm {} \;
-}
-
-cleanup;
+# Clear the decks
+find $UMC -type f -regex '.*-p[ly]' -exec rm {} \;
# The enumeration relies on $ not being in any filename
-for file in `find $UMC -name '*.cfg' | tr ' ' '$'; find $UMC -type f
-wholename '*/maps/*'`
+for file in `find $UMC -name '*.cfg' | tr ' ' '$'; find $UMC -type f \! -name
'*.png' \! -name '*.jpg' -wholename '*/maps/*'`
do
file=`echo $file | tr '$' ' '`
- echo "${file}"
if map_convert.pl ${TERRAIN} "${file}" "${file}-pl"
then
if map_convert.py ${TERRAIN} "${file}" "${file}-py"
then
- diff -u "${file}-pl" "${file}-py"
+ if diff -u "${file}-pl" "${file}-py"
+ then
+ rm "${file}-pl" "${file}-py"
+ else
+ echo "${file}: regression failed"
+ fi
else
- echo "Python conversion failed"
+ echo "${file}: Python conversion failed"
+ rm "${file}-pl"
exit 1
fi
else
- echo "Perl conversion failed"
+ echo "${file}: Perl conversion failed"
continue
- #exit 1
fi
done
-# -pl and -py files are left in place only if something failed
-cleanup;
exit 0
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
