commit a8c4fc5e1f2c4215544aff004d42f235d7e9d14f
author Keith Packard <keithp@keithp.com> Mon Oct 29 16:36:11 2018 -0700
committer Akira TAGOH <akira@tagoh.org> Wed Apr 03 12:02:09 2019 +0000
tree c6de866d9e865b4f6c2b0aa10d74dc45509187ff
parent 2a81aa51f08085c81666f40f34068f2c6512e974

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>

test/test-bz106632.c

diff --git a/test/test-bz106632.c b/test/test-bz106632.c
index cf3bbcf..5db912b 100644
--- a/test/test-bz106632.c
+++ b/test/test-bz106632.c
@@ -191,7 +191,7 @@
     mkdir_p ((const char *) cachedir);
 
     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);
 
     fprintf (stderr, "D: Loading a config\n");
@@ -220,13 +220,19 @@
 	goto bail;
     }
     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);
     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");
-	ret = 2;
+	ret = 3;
 	goto bail;
     }
     if (FcConfigGetCurrent () == config)
@@ -259,10 +265,16 @@
 	goto bail;
     }
     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);
     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");
 	ret = 2;