summaryrefslogtreecommitdiff
path: root/clutter
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2017-02-17 16:59:51 +0100
committerCarlos Garnacho <carlosg@gnome.org>2017-02-17 17:01:57 +0100
commit46d516cb0464224dce2c578e3804ae7f7ae5d951 (patch)
tree4010661a1c036d7f199f12707e77463766c573b3 /clutter
parent4d0a886c4587549f814fb16a197b1c5de5bc212f (diff)
downloadmutter-46d516cb0464224dce2c578e3804ae7f7ae5d951.tar.gz
clutter: Force scale=1 in tests/conform
Device pixel sizes are compared in several places, which breaks some tests on hidpi setups.
Diffstat (limited to 'clutter')
-rw-r--r--clutter/tests/conform/Makefile.am2
1 files changed, 1 insertions, 1 deletions
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