|
Line
Link Here
|
| 0 |
-- /src/fcdir.c |
0 |
++ /src/fcdir.c |
|
Lines 421-433
Link Here
|
| 421 |
/* Not using existing cache file, construct new cache */ |
421 |
/* Not using existing cache file, construct new cache */ |
| 422 |
if (!cache) |
422 |
if (!cache) |
| 423 |
cache = FcDirCacheScan (dir, config); |
423 |
cache = FcDirCacheScan (dir, config); |
| 424 |
if (cache) |
|
|
| 425 |
{ |
| 426 |
FcFontSet *fs = FcCacheSet (cache); |
| 427 |
|
| 428 |
if (cache->dirs_count == 0 && (!fs || fs->nfont == 0)) |
| 429 |
FcDirCacheDeleteUUID (dir, config); |
| 430 |
} |
| 431 |
|
424 |
|
| 432 |
return cache; |
425 |
return cache; |
| 433 |
} |
426 |
} |
| 434 |
-- /test/run-test.sh |
427 |
++ /test/run-test.sh |
|
Lines 239-257
Link Here
|
| 239 |
|
239 |
|
| 240 |
rm -rf $MyPWD/sysroot |
240 |
rm -rf $MyPWD/sysroot |
| 241 |
|
241 |
|
| 242 |
dotest "deleting .uuid file on empty dir" |
|
|
| 243 |
prep |
| 244 |
cp $FONT1 $FONT2 $FONTDIR |
| 245 |
$FCCACHE $FONTDIR |
| 246 |
sleep 1 |
| 247 |
rm -f $FONTDIR/*pcf |
| 248 |
$FCCACHE $FONTDIR |
| 249 |
rmdir $FONTDIR > /dev/null 2>&1 |
| 250 |
if [ $? != 0 ]; then |
| 251 |
echo "*** Test failed: $TEST" |
| 252 |
echo "$FONTDIR isn't empty" |
| 253 |
ls -al $FONTDIR |
| 254 |
exit 1 |
| 255 |
fi |
| 256 |
|
| 257 |
rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out |
242 |
rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out |
