From 85ca44c1ca2ad24e8e65344ea61fea983133d350 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 13:29:38 +0000 Subject: Apply patch fontconfig-test-delay.patch patch_name: fontconfig-test-delay.patch present_in_specfile: true location_in_specfile: 5 --- diff --git a/test/test-bz106632.c b/test/test-bz106632.c index daa0c1e..7ebd9ea 100644 --- a/test/test-bz106632.c +++ b/test/test-bz106632.c @@ -197,7 +197,7 @@ main (void) mkdir_p (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); system (cmd); fprintf (stderr, "D: Loading a config\n"); @@ -226,15 +226,21 @@ main (void) goto bail; } fprintf (stderr, "D: Removing %s\n", fontdir); - snprintf (cmd, 512, "rm -f %s%s*", fontdir, FC_DIR_SEPARATOR_S); + snprintf (cmd, 512, "sleep 1; rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S); system (cmd); fprintf (stderr, "D: Reinitializing\n"); - if (!FcConfigUptoDate (config) || !FcInitReinitialize ()) + if (FcConfigUptoDate (config)) { - fprintf (stderr, "E: Unable to reinitialize\n"); + fprintf (stderr, "E: Config reports up-to-date\n"); ret = 2; goto bail; } + if (!FcInitReinitialize ()) + { + fprintf (stderr, "E: Unable to reinitialize\n"); + ret = 3; + goto bail; + } if (FcConfigGetCurrent () == config) { fprintf (stderr, "E: config wasn't reloaded\n"); @@ -265,10 +271,16 @@ main (void) goto bail; } 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); 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;