diff options
| author | Patrick Lam <plam@MIT.EDU> | 2006-08-04 16:13:00 +0000 |
|---|---|---|
| committer | Patrick Lam <plam@MIT.EDU> | 2006-08-04 16:13:00 +0000 |
| commit | 7410e40bd93beb4ab1a577d084112413431cede2 (patch) | |
| tree | 036eeeccf20ddd740b3c3a18e169951f5f45abdf /test | |
| parent | 62a4a8459adaf26833e1dad0ee96ea5a4b8c3d54 (diff) | |
2006-08-04 Keith Packard (keithp@keithp.com) reviewed by: plam
Make cache directories configurable. Simplify and correct some code which
deals with per-directory caches.
Diffstat (limited to 'test')
| -rw-r--r-- | test/fonts.conf.in | 1 | ||||
| -rw-r--r-- | test/run-test.sh | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/fonts.conf.in b/test/fonts.conf.in index 492e36fa..5ad85c9e 100644 --- a/test/fonts.conf.in +++ b/test/fonts.conf.in @@ -1,4 +1,5 @@ <fontconfig> <dir>@FONTDIR@</dir> <cache>@CACHEFILE@</cache> +<cachedir>@CACHEDIR@</cachedir> </fontconfig> diff --git a/test/run-test.sh b/test/run-test.sh index 428503b3..8b817c08 100644 --- a/test/run-test.sh +++ b/test/run-test.sh @@ -3,6 +3,7 @@ TESTDIR=${srcdir-`pwd`} FONTDIR=`pwd`/fonts CACHEFILE=`pwd`/fonts.cache +CACHEDIR=`pwd`/cache.dir ECHO=true @@ -39,7 +40,8 @@ dotest () { } sed "s!@FONTDIR@!$FONTDIR! -s!@CACHEFILE@!$CACHEFILE!" < $TESTDIR/fonts.conf.in > fonts.conf +s!@CACHEFILE@!$CACHEFILE! +s!@CACHEDIR@!$CACHEDIR!" < $TESTDIR/fonts.conf.in > fonts.conf FONTCONFIG_FILE=`pwd`/fonts.conf export FONTCONFIG_FILE @@ -89,4 +91,4 @@ mkdir $FONTDIR/a cp $FONT2 $FONTDIR/a check -rm -rf $FONTDIR $CACHEFILE $FONTCONFIG_FILE out +rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out |