From 7a1fa04185a844139fcb7663c0c17fec300381f4 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 24 Oct 2013 07:59:50 +0900
Subject: [PATCH] Bug 929896 - Make GTEST_CPP_SOURCES a
 StrictOrderingOnAppendList. r=mshal

---
 gfx/tests/gtest/moz.build                        | 16 ++++++++--------
 .../mozbuild/frontend/sandbox_symbols.py         |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build
index 52693c1bcec4..12e1fc9fa7fb 100644
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -9,19 +9,19 @@ MODULE = 'gfxtest'
 LIBRARY_NAME = 'gfxtest'
 
 GTEST_CPP_SOURCES += [
+    'TestAsyncPanZoomController.cpp',
+    'TestBufferRotation.cpp',
+    'TestColorNames.cpp',
+    'TestLayers.cpp',
+    'TestRegion.cpp',
+    'TestTextures.cpp',
+    'TestTiledLayerBuffer.cpp',
     # Hangs on linux in ApplyGdkScreenFontOptions
     #'gfxFontSelectionTest.cpp',
     'gfxSurfaceRefCountTest.cpp',
     # Test works but it doesn't assert anything
     #'gfxTextRunPerfTest.cpp',
     'gfxWordCacheTest.cpp',
-    'TestAsyncPanZoomController.cpp',
-    'TestLayers.cpp',
-    'TestTiledLayerBuffer.cpp',
-    'TestRegion.cpp',
-    'TestColorNames.cpp',
-    'TestTextures.cpp',
-    'TestBufferRotation.cpp',
 ]
 
 # Because of gkmedia on windows we wont find these
@@ -30,8 +30,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
     GTEST_CPP_SOURCES += [
         'TestBase.cpp',
         'TestMoz2D.cpp',
-        'TestRect.cpp',
         'TestPoint.cpp',
+        'TestRect.cpp',
         'TestScaling.cpp',
     ]
 
diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
index c6c4d23ae063..6622d7d2fd6b 100644
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -198,7 +198,7 @@ VARIABLES = {
         to compile.
         """, 'compile'),
 
-    'GTEST_CPP_SOURCES': (list, list, [],
+    'GTEST_CPP_SOURCES': (StrictOrderingOnAppendList, list, [],
         """C++ source files for GTest unit tests.
 
         This is a list of C++ GTest unit test sources. Entries must be files