[cairo-commit] 3 commits - test/meson.build test/reference

[GitLab Mirror]

 test/meson.build                                |    2 +-
 test/reference/pthread-show-text.quartz.ref.png |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42d3f4cc29338dce02faf062ef6f18a1fe32ca99
Merge: 187fd83aa b1135db01
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sat Aug 28 12:49:37 2021 +0000

    Merge branch 'meson-pthread-tests' into 'master'
    
    meson: enable pthread tests if 'real pthread' is available
    
    Closes #477
    
    See merge request cairo/cairo!176

commit b1135db01415601c2393e4b11dadead7e44fb5fb
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sat Aug 28 12:57:17 2021 +0100

    test: update quartz ref image to fix macos pthread test failure
    
    The proper pthread check activated some tests that weren't active
    before, which resulted in a test failure apparently caused by
    inexact test rendering.
    
    Update the quartz reference image accordingly.

diff --git a/test/reference/pthread-show-text.quartz.ref.png b/test/reference/pthread-show-text.quartz.ref.png
index 77971f956..5d51b40ad 100644
Binary files a/test/reference/pthread-show-text.quartz.ref.png and b/test/reference/pthread-show-text.quartz.ref.png differ
commit e78a90ed983d98a2bc8364a16f33e6319e632058
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed May 5 00:15:16 2021 +0100

    meson: enable pthread tests if 'real pthread' is available
    
    Fixes #477

diff --git a/test/meson.build b/test/meson.build
index 73bb0d2d9..b7bda2333 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -517,7 +517,7 @@ build_any2ppm = false
 has_multipage_surfaces = false
 add_fallback_resolution = false
 
-if conf.get('HAVE_REAL_PTHREAD', 0) == 1
+if conf.get('CAIRO_HAS_REAL_PTHREAD', 0) == 1
   test_sources += test_pthread_sources
 endif