Bug 1043351 - Build ShowSSEConfig as a C++ unit test after it was forgotten in bug 894941 and move linker tests to avoid conflicts. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 25 Jul 2014 07:14:21 +0900
changeset 217704 77804ecb85661104f3c39dca83bcd89b9bbb2824
parent 217703 ae2061a3eb408723f9e0c96c1e2521eb0ee44e3d
child 217705 0300f04572b6a6d1ad192acd1608da0dd8cc1ba5
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1043351, 894941
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1043351 - Build ShowSSEConfig as a C++ unit test after it was forgotten in bug 894941 and move linker tests to avoid conflicts. r=mshal
mozglue/linker/moz.build
mozglue/linker/tests/Makefile.in
mozglue/linker/tests/TestZip.cpp
mozglue/linker/tests/moz.build
mozglue/linker/tests/no_central_dir.zip
mozglue/linker/tests/test.zip
mozglue/moz.build
mozglue/tests/Makefile.in
mozglue/tests/TestZip.cpp
mozglue/tests/moz.build
mozglue/tests/no_central_dir.zip
mozglue/tests/test.zip
--- a/mozglue/linker/moz.build
+++ b/mozglue/linker/moz.build
@@ -21,8 +21,10 @@ HOST_SOURCES += [
 
 HOST_PROGRAM = 'szip'
 
 FINAL_LIBRARY = 'mozglue'
 
 DEFINES['IMPL_MFBT'] = True
 
 DISABLE_STL_WRAPPING = True
+
+TEST_TOOL_DIRS += ['tests']
rename from mozglue/tests/Makefile.in
rename to mozglue/linker/tests/Makefile.in
rename from mozglue/tests/TestZip.cpp
rename to mozglue/linker/tests/TestZip.cpp
copy from mozglue/tests/moz.build
copy to mozglue/linker/tests/moz.build
--- a/mozglue/tests/moz.build
+++ b/mozglue/linker/tests/moz.build
@@ -1,21 +1,19 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 NO_DIST_INSTALL = True
 
-if CONFIG['MOZ_LINKER']:
-    SOURCES += [
-        'ShowSSEConfig.cpp',
-        'TestZip.cpp',
-    ]
-    SIMPLE_PROGRAMS += [
-        'TestZip',
-    ]
-    LOCAL_INCLUDES += ['../linker']
-    USE_LIBS += [
-        'linker',
-    ]
-    DISABLE_STL_WRAPPING = True
+SOURCES += [
+    'TestZip.cpp',
+]
+SIMPLE_PROGRAMS += [
+    'TestZip',
+]
+LOCAL_INCLUDES += ['..']
+USE_LIBS += [
+    'linker',
+]
+DISABLE_STL_WRAPPING = True
rename from mozglue/tests/no_central_dir.zip
rename to mozglue/linker/tests/no_central_dir.zip
rename from mozglue/tests/test.zip
rename to mozglue/linker/tests/test.zip
--- a/mozglue/moz.build
+++ b/mozglue/moz.build
@@ -7,9 +7,9 @@
 if CONFIG['MOZ_LINKER']:
     DIRS += ['linker']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['android']
 
 DIRS += ['build']
 
-TEST_DIRS += ['tests']
+TEST_TOOL_DIRS += ['tests']
--- a/mozglue/tests/moz.build
+++ b/mozglue/tests/moz.build
@@ -1,21 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-NO_DIST_INSTALL = True
+DISABLE_STL_WRAPPING = True
 
-if CONFIG['MOZ_LINKER']:
-    SOURCES += [
-        'ShowSSEConfig.cpp',
-        'TestZip.cpp',
-    ]
-    SIMPLE_PROGRAMS += [
-        'TestZip',
-    ]
-    LOCAL_INCLUDES += ['../linker']
-    USE_LIBS += [
-        'linker',
-    ]
-    DISABLE_STL_WRAPPING = True
+SOURCES += [
+    'ShowSSEConfig.cpp',
+]
+
+CPP_UNIT_TESTS += [
+    'ShowSSEConfig',
+]