From 46d516cb0464224dce2c578e3804ae7f7ae5d951 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 17 Feb 2017 16:59:51 +0100 Subject: clutter: Force scale=1 in tests/conform Device pixel sizes are compared in several places, which breaks some tests on hidpi setups. --- clutter/tests/conform/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am index 369e1c1c1..9cef08b29 100644 --- a/clutter/tests/conform/Makefile.am +++ b/clutter/tests/conform/Makefile.am @@ -79,7 +79,7 @@ script_tests = \ test-script-timeline-markers.json \ test-state-1.json -TESTS_ENVIRONMENT += G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 +TESTS_ENVIRONMENT += G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 CLUTTER_SCALE=1 # simple rules for generating a Git ignore file for the conformance test suite $(srcdir)/.gitignore: Makefile -- cgit v1.2.1