From 83d97406fa275882067cd256b36eb8c3273d42be Mon Sep 17 00:00:00 2001 From: Henning Makholm Date: Sun, 16 Apr 2006 18:00:00 -0400 Subject: Import of release 1.0.3 --- (limited to 'test/dotest') 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 -- cgit v0.9.1