[mutter] clutter: Force scale=1 in tests/conform

[Carlos Garnacho <carlosg src gnome org>]

commit 46d516cb0464224dce2c578e3804ae7f7ae5d951
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Feb 17 16:59:51 2017 +0100

    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 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
index 369e1c1..9cef08b 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