summaryrefslogtreecommitdiffstats
path: root/test/dotest
diff options
context:
space:
mode:
authorHenning Makholm <henning@makholm.net>2006-04-16 18:00:00 (EDT)
committer Julien Jorge <julien.jorge@stuff-o-matic.com>2013-01-10 16:07:28 (EST)
commit83d97406fa275882067cd256b36eb8c3273d42be (patch)
treef3b74be6a88d069739b33e20ca9f4d4f456d575f /test/dotest
parent27f6ea800cfd66b1024b0379aa1ac9631e799ee7 (diff)
downloadxcftools-83d97406fa275882067cd256b36eb8c3273d42be.zip
xcftools-83d97406fa275882067cd256b36eb8c3273d42be.tar.gz
xcftools-83d97406fa275882067cd256b36eb8c3273d42be.tar.bz2
Import of release 1.0.3
Diffstat (limited to 'test/dotest')
-rwxr-xr-xtest/dotest7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/dotest b/test/dotest
index 17b9e83..d75dbfb 100755
--- a/test/dotest
+++ b/test/dotest
@@ -257,9 +257,10 @@ echo > expected:stderr \
errtest 20 xcfinfo $S/tiletest.xcf.gz Background 'Long and low'
rm expected:stderr
-rgbfile=/usr/lib/X11/rgb.txt
-( [ -f $rgbfile ] || echo "Could not open color database file $rgbfile" ) \
- > expected.stderr
+( for a in /etc/X11/rgb.txt /usr/share/X11/rgb.txt /usr/lib/X11/rgb.txt /-/ ;
+ do [ -f $a ] && break ;
+ [ $a = /-/ ] && echo "Could not find X11 color database" ;
+ done ) > expected.stderr
echo "${XCFTOOLS_PREFIX}xcf2pnm: Unknown background color 'Plaid'" \
>> expected.stderr
errtest 20 xcf2pnm $S/tiletest.xcf.gz -b Plaid