walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add delays to test-bz106632, check UptoDate separately 

On a file system with one-second time stamps, extra delays are needed
between cache modification operations to ensure that fontconfig isn't
fooled.

And, when the timestamps are checked correctly, we need to make sure
that FcConfigUptoDate returns false whenever we change a font
directory, so separate that out from the call to reinitialize the core
config.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2018-10-29 16:36:11 -07:00 committed by Akira TAGOH
parent 2a81aa51f0
commit a8c4fc5e1f
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/test-bz106632.c
View File

@ -191,7 +191,7 @@ main (void)
mkdir_p ((const char *) cachedir); mkdir_p ((const char *) cachedir);
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir); fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir); snprintf (cmd, 512, "sleep 1; cp -a %s %s; sleep 1", FONTFILE, fontdir);
(void) system (cmd); (void) system (cmd);
fprintf (stderr, "D: Loading a config\n"); fprintf (stderr, "D: Loading a config\n");
@ -220,13 +220,19 @@ main (void)
goto bail; goto bail;
} }
fprintf (stderr, "D: Removing %s\n", fontdir); fprintf (stderr, "D: Removing %s\n", fontdir);
snprintf (cmd, 512, "rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S); snprintf (cmd, 512, "sleep 1; rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S);
(void) system (cmd); (void) system (cmd);
fprintf (stderr, "D: Reinitializing\n"); fprintf (stderr, "D: Reinitializing\n");
if (!FcConfigUptoDate (config) || !FcInitReinitialize ()) if (FcConfigUptoDate(config))
{
fprintf (stderr, "E: Config reports up-to-date\n");
ret = 2;
goto bail;
}
if (!FcInitReinitialize ())
{ {
fprintf (stderr, "E: Unable to reinitialize\n"); fprintf (stderr, "E: Unable to reinitialize\n");
ret = 2; ret = 3;
goto bail; goto bail;
} }
if (FcConfigGetCurrent () == config) if (FcConfigGetCurrent () == config)
@ -259,10 +265,16 @@ main (void)
goto bail; goto bail;
} }
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir); fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
snprintf (cmd, 512, "cp -a %s %s; sleep 1", FONTFILE, fontdir); snprintf (cmd, 512, "sleep 1; cp -a %s %s; sleep 1", FONTFILE, fontdir);
(void) system (cmd); (void) system (cmd);
fprintf (stderr, "D: Reinitializing\n"); fprintf (stderr, "D: Reinitializing\n");
if (!FcConfigUptoDate (config) || !FcInitReinitialize ()) if (FcConfigUptoDate(config))
{
fprintf (stderr, "E: Config up-to-date after addition\n");
ret = 3;
goto bail;
}
if (!FcInitReinitialize ())
{ {
fprintf (stderr, "E: Unable to reinitialize\n"); fprintf (stderr, "E: Unable to reinitialize\n");
ret = 2; ret = 2;