Skip to content

A
angle
Commit 163965d5 by Corentin Wallez Committed by Commit Bot
Options

BUILD.gn: prepare dEQP test support on Mac

BUG=angleproject:1569 Change-Id: I703f4739726c849950ba103049fa39498a4ff1df Reviewed-on: https://chromium-review.googlesource.com/744361Reviewed-by: 's avatarFrank Henigman <fjhenigman@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
parent e7c5f4f0
Showing with 124 additions and 103 deletions
BUILD.gn
...@@ -276,6 +276,7 @@ static_library("angle_gpu_info_util") { ...@@ -276,6 +276,7 @@ static_library("angle_gpu_info_util") {
libs += [ libs += [
"IOKit.framework", "IOKit.framework",
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreGraphics.framework",
] ]
} }
} }
......
src/tests/BUILD.gn
...@@ -384,6 +384,11 @@ if (build_angle_deqp_tests) { ...@@ -384,6 +384,11 @@ if (build_angle_deqp_tests) {
public_configs = [ ":angle_deqp_gtest_support_config" ] public_configs = [ ":angle_deqp_gtest_support_config" ]
sources = deqp_gypi.deqp_gpu_test_expectations_sources sources = deqp_gypi.deqp_gpu_test_expectations_sources
if (is_mac) {
sources += deqp_gypi.deqp_gpu_test_expectations_sources_mac
libs = [ "Cocoa.framework" ]
}
if (build_with_chromium) { if (build_with_chromium) {
sources += [ "//gpu/angle_deqp_tests_main.cc" ] sources += [ "//gpu/angle_deqp_tests_main.cc" ]
} else { } else {
......
src/tests/deqp.gypi
...@@ -1198,6 +1198,11 @@ ...@@ -1198,6 +1198,11 @@
'third_party/gpu_test_expectations/gpu_test_expectations_parser.cc', 'third_party/gpu_test_expectations/gpu_test_expectations_parser.cc',
'third_party/gpu_test_expectations/gpu_test_expectations_parser.h', 'third_party/gpu_test_expectations/gpu_test_expectations_parser.h',
], ],
'deqp_gpu_test_expectations_sources_mac':
[
'third_party/gpu_test_expectations/gpu_test_config_mac.mm',
'third_party/gpu_test_expectations/gpu_test_config_mac.h',
],
'conditions': 'conditions':
[ [
['(OS=="win" or OS=="linux" or OS=="mac")', ['(OS=="win" or OS=="linux" or OS=="mac")',
...@@ -1857,8 +1862,7 @@ ...@@ -1857,8 +1862,7 @@
{ {
'sources': 'sources':
[ [
'third_party/gpu_test_expectations/gpu_test_config_mac.h', '<@(deqp_gpu_test_expectations_sources_mac)',
'third_party/gpu_test_expectations/gpu_test_config_mac.mm',
], ],
}], }],
], ],
......
src/tests/third_party/gpu_test_expectations/angle-mods.patch
diff --git a/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md b/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md diff -u -rupN gpu_test_expectations_reverted/HowToMakeChanges.md gpu_test_expectations/HowToMakeChanges.md
new file mode 100644 --- gpu_test_expectations_reverted/HowToMakeChanges.md 1969-12-31 19:00:00.000000000 -0500
index 000000000..190a3e9c3 +++ gpu_test_expectations/HowToMakeChanges.md 2016-09-13 10:06:02.000000000 -0400
--- /dev/null
+++ b/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
+Because the ```gpu_test_expectations``` directory is based on parts of Chromium's ```gpu/config``` +Because the ```gpu_test_expectations``` directory is based on parts of Chromium's ```gpu/config```
+directory, we want to keep a patch of the changes added to make it compile with ANGLE. This +directory, we want to keep a patch of the changes added to make it compile with ANGLE. This
...@@ -26,11 +24,9 @@ index 000000000..190a3e9c3 ...@@ -26,11 +24,9 @@ index 000000000..190a3e9c3
+ * ```git diff HEAD~ (`)ls(`) > angle-mods.patch```,```git add angle-mods.patch```, ```git commit --amend``` + * ```git diff HEAD~ (`)ls(`) > angle-mods.patch```,```git add angle-mods.patch```, ```git commit --amend```
+ * ```git rebase -i``` to squash the three patches into one. + * ```git rebase -i``` to squash the three patches into one.
+ +
diff --git a/src/tests/third_party/gpu_test_expectations/angle_config.h b/src/tests/third_party/gpu_test_expectations/angle_config.h diff -u -rupN gpu_test_expectations_reverted/angle_config.h gpu_test_expectations/angle_config.h
new file mode 100644 --- gpu_test_expectations_reverted/angle_config.h 1969-12-31 19:00:00.000000000 -0500
index 000000000..1e67e6279 +++ gpu_test_expectations/angle_config.h 2017-09-11 17:18:07.000000000 -0400
--- /dev/null
+++ b/src/tests/third_party/gpu_test_expectations/angle_config.h
@@ -0,0 +1,73 @@ @@ -0,0 +1,73 @@
+// +//
+// Copyright 2015 The ANGLE Project Authors. All rights reserved. +// Copyright 2015 The ANGLE Project Authors. All rights reserved.
...@@ -105,10 +101,9 @@ index 000000000..1e67e6279 ...@@ -105,10 +101,9 @@ index 000000000..1e67e6279
+// clang-format on +// clang-format on
+ +
+#endif +#endif
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_info.cc b/src/tests/third_party/gpu_test_expectations/gpu_info.cc diff -u -rupN gpu_test_expectations_reverted/gpu_info.cc gpu_test_expectations/gpu_info.cc
index e01e17a9a..6632abad4 100644 --- gpu_test_expectations_reverted/gpu_info.cc 2017-10-30 14:30:27.000000000 -0400
--- a/src/tests/third_party/gpu_test_expectations/gpu_info.cc +++ gpu_test_expectations/gpu_info.cc 2017-10-27 13:46:39.000000000 -0400
+++ b/src/tests/third_party/gpu_test_expectations/gpu_info.cc
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
#include <stdint.h> #include <stdint.h>
...@@ -118,7 +113,7 @@ index e01e17a9a..6632abad4 100644 ...@@ -118,7 +113,7 @@ index e01e17a9a..6632abad4 100644
namespace { namespace {
@@ -100,7 +100,7 @@ const GPUInfo::GPUDevice& GPUInfo::active_gpu() const { @@ -100,7 +100,7 @@ const GPUInfo::GPUDevice& GPUInfo::activ
if (secondary_gpu.active) if (secondary_gpu.active)
return secondary_gpu; return secondary_gpu;
} }
...@@ -127,10 +122,9 @@ index e01e17a9a..6632abad4 100644 ...@@ -127,10 +122,9 @@ index e01e17a9a..6632abad4 100644
return gpu; return gpu;
} }
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_info.h b/src/tests/third_party/gpu_test_expectations/gpu_info.h diff -u -rupN gpu_test_expectations_reverted/gpu_info.h gpu_test_expectations/gpu_info.h
index 274772e7c..250f1f32e 100644 --- gpu_test_expectations_reverted/gpu_info.h 2017-10-30 14:30:27.000000000 -0400
--- a/src/tests/third_party/gpu_test_expectations/gpu_info.h +++ gpu_test_expectations/gpu_info.h 2017-10-27 13:46:39.000000000 -0400
+++ b/src/tests/third_party/gpu_test_expectations/gpu_info.h
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -162,10 +156,9 @@ index 274772e7c..250f1f32e 100644 ...@@ -162,10 +156,9 @@ index 274772e7c..250f1f32e 100644
-#endif // GPU_CONFIG_GPU_INFO_H_ -#endif // GPU_CONFIG_GPU_INFO_H_
+#endif // ANGLE_GPU_CONFIG_GPU_INFO_H_ +#endif // ANGLE_GPU_CONFIG_GPU_INFO_H_
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc b/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc diff -u -rupN gpu_test_expectations_reverted/gpu_test_config.cc gpu_test_expectations/gpu_test_config.cc
index 979950943..802885e06 100644 --- gpu_test_expectations_reverted/gpu_test_config.cc 2017-10-30 14:30:27.000000000 -0400
--- a/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc +++ gpu_test_expectations/gpu_test_config.cc 2017-10-30 14:44:19.000000000 -0400
+++ b/src/tests/third_party/gpu_test_expectations/gpu_test_config.cc
@@ -2,21 +2,53 @@ @@ -2,21 +2,53 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -228,7 +221,17 @@ index 979950943..802885e06 100644 ...@@ -228,7 +221,17 @@ index 979950943..802885e06 100644
namespace gpu { namespace gpu {
namespace { namespace {
@@ -76,6 +108,26 @@ GPUTestConfig::OS GetCurrentOS() { @@ -46,8 +78,7 @@ GPUTestConfig::OS GetCurrentOS() {
int32_t major_version = 0;
int32_t minor_version = 0;
int32_t bugfix_version = 0;
- base::SysInfo::OperatingSystemVersionNumbers(
- &major_version, &minor_version, &bugfix_version);
+ angle::GetOperatingSystemVersionNumbers(&major_version, &minor_version, &bugfix_version);
if (major_version == 10) {
switch (minor_version) {
case 5:
@@ -76,6 +107,26 @@ GPUTestConfig::OS GetCurrentOS() {
return GPUTestConfig::kOsUnknown; return GPUTestConfig::kOsUnknown;
} }
...@@ -255,7 +258,7 @@ index 979950943..802885e06 100644 ...@@ -255,7 +258,7 @@ index 979950943..802885e06 100644
} // namespace anonymous } // namespace anonymous
GPUTestConfig::GPUTestConfig() GPUTestConfig::GPUTestConfig()
@@ -260,7 +312,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) { @@ -260,7 +311,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
GPUInfo my_gpu_info; GPUInfo my_gpu_info;
CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info); CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info);
if (result != kCollectInfoSuccess) { if (result != kCollectInfoSuccess) {
...@@ -264,7 +267,7 @@ index 979950943..802885e06 100644 ...@@ -264,7 +267,7 @@ index 979950943..802885e06 100644
DisableGPUInfoValidation(); DisableGPUInfoValidation();
rt = true; rt = true;
} else { } else {
@@ -271,7 +323,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) { @@ -271,7 +322,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
} }
set_os(GetCurrentOS()); set_os(GetCurrentOS());
if (os() == kOsUnknown) { if (os() == kOsUnknown) {
...@@ -273,10 +276,9 @@ index 979950943..802885e06 100644 ...@@ -273,10 +276,9 @@ index 979950943..802885e06 100644
rt = false; rt = false;
} }
#if defined(NDEBUG) #if defined(NDEBUG)
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_config.h b/src/tests/third_party/gpu_test_expectations/gpu_test_config.h diff -u -rupN gpu_test_expectations_reverted/gpu_test_config.h gpu_test_expectations/gpu_test_config.h
index 66f46fc46..89bf5b156 100644 --- gpu_test_expectations_reverted/gpu_test_config.h 2017-10-30 14:30:27.000000000 -0400
--- a/src/tests/third_party/gpu_test_expectations/gpu_test_config.h +++ gpu_test_expectations/gpu_test_config.h 2017-10-27 13:46:39.000000000 -0400
+++ b/src/tests/third_party/gpu_test_expectations/gpu_test_config.h
@@ -2,16 +2,15 @@ @@ -2,16 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -297,19 +299,17 @@ index 66f46fc46..89bf5b156 100644 ...@@ -297,19 +299,17 @@ index 66f46fc46..89bf5b156 100644
namespace gpu { namespace gpu {
@@ -145,5 +144,5 @@ class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig { @@ -145,5 +144,5 @@ class GPU_EXPORT GPUTestBotConfig : publ
} // namespace gpu } // namespace gpu
-#endif // GPU_CONFIG_GPU_TEST_CONFIG_H_ -#endif // GPU_CONFIG_GPU_TEST_CONFIG_H_
+#endif // ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_ +#endif // ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.h b/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.h diff -u -rupN gpu_test_expectations_reverted/gpu_test_config_mac.h gpu_test_expectations/gpu_test_config_mac.h
new file mode 100644 --- gpu_test_expectations_reverted/gpu_test_config_mac.h 1969-12-31 19:00:00.000000000 -0500
index 000000000..64d0d1e67 +++ gpu_test_expectations/gpu_test_config_mac.h 2017-10-30 14:44:19.000000000 -0400
--- /dev/null @@ -0,0 +1,24 @@
+++ b/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.h
@@ -0,0 +1,27 @@
+// +//
+// Copyright 2015 The ANGLE Project Authors. All rights reserved. +// Copyright 2015 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be +// Use of this source code is governed by a BSD-style license that can be
...@@ -324,25 +324,20 @@ index 000000000..64d0d1e67 ...@@ -324,25 +324,20 @@ index 000000000..64d0d1e67
+ +
+#include "gpu_info.h" +#include "gpu_info.h"
+ +
+namespace base { +namespace angle
+
+class SysInfo
+{ +{
+ public:
+ static void OperatingSystemVersionNumbers(int32_t *major_version,
+ int32_t *minor_version,
+ int32_t *bugfix_version);
+};
+ +
+} // namespace base +void GetOperatingSystemVersionNumbers(int32_t *major_version,
+ int32_t *minor_version,
+ int32_t *bugfix_version);
+
+} // namespace angle
+ +
+#endif // ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_ +#endif // ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.mm b/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.mm diff -u -rupN gpu_test_expectations_reverted/gpu_test_config_mac.mm gpu_test_expectations/gpu_test_config_mac.mm
new file mode 100644 --- gpu_test_expectations_reverted/gpu_test_config_mac.mm 1969-12-31 19:00:00.000000000 -0500
index 000000000..cb27f8a20 +++ gpu_test_expectations/gpu_test_config_mac.mm 2017-10-30 14:31:32.000000000 -0400
--- /dev/null @@ -0,0 +1,49 @@
+++ b/src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.mm
@@ -0,0 +1,38 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be +// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file. +// found in the LICENSE file.
...@@ -354,8 +349,6 @@ index 000000000..cb27f8a20 ...@@ -354,8 +349,6 @@ index 000000000..cb27f8a20
+ +
+#import <Cocoa/Cocoa.h> +#import <Cocoa/Cocoa.h>
+ +
+namespace base {
+
+// OSX 10.8 deprecates Gestalt but doesn't make the operatingSystemVersion property part of the +// OSX 10.8 deprecates Gestalt but doesn't make the operatingSystemVersion property part of the
+// public interface of NSProcessInfo until 10.10. Add a forward declaration. +// public interface of NSProcessInfo until 10.10. Add a forward declaration.
+#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 +#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
...@@ -364,27 +357,39 @@ index 000000000..cb27f8a20 ...@@ -364,27 +357,39 @@ index 000000000..cb27f8a20
+@end +@end
+#endif +#endif
+ +
+void SysInfo::OperatingSystemVersionNumbers(int32_t *major_version, +namespace angle
+ int32_t *minor_version, +{
+ int32_t *bugfix_version) +
+void GetOperatingSystemVersionNumbers(int32_t *major_version,
+ int32_t *minor_version,
+ int32_t *bugfix_version)
+{ +{
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8 +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
+ Gestalt(gestaltSystemVersionMajor, reinterpret_cast<SInt32*>(major_version)); + Gestalt(gestaltSystemVersionMajor, reinterpret_cast<SInt32 *>(major_version));
+ Gestalt(gestaltSystemVersionMinor, reinterpret_cast<SInt32*>(minor_version)); + Gestalt(gestaltSystemVersionMinor, reinterpret_cast<SInt32 *>(minor_version));
+ Gestalt(gestaltSystemVersionBugFix, reinterpret_cast<SInt32*>(bugfix_version)); + Gestalt(gestaltSystemVersionBugFix, reinterpret_cast<SInt32 *>(bugfix_version));
+#else +#else
+ NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; + if (@available(macOS 10.10, *))
+ *major_version = version.majorVersion; + {
+ *minor_version = version.minorVersion; + NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
+ *bugfix_version = version.patchVersion; + *major_version = version.majorVersion;
+ *minor_version = version.minorVersion;
+ *bugfix_version = version.patchVersion;
+ }
+ else
+ {
+ // This can only happen on 10.9
+ *major_version = 10;
+ *minor_version = 9;
+ *bugfix_version = 0;
+ }
+#endif +#endif
+} +}
+ +
+} // namespace base +} // namespace angle
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc diff -u -rupN gpu_test_expectations_reverted/gpu_test_expectations_parser.cc gpu_test_expectations/gpu_test_expectations_parser.cc
index 7dc8b2ac5..a2d1ee616 100644 --- gpu_test_expectations_reverted/gpu_test_expectations_parser.cc 2017-10-30 14:30:35.000000000 -0400
--- a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc +++ gpu_test_expectations/gpu_test_expectations_parser.cc 2017-10-27 13:46:39.000000000 -0400
+++ b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc
@@ -2,17 +2,47 @@ @@ -2,17 +2,47 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -452,7 +457,7 @@ index 7dc8b2ac5..a2d1ee616 100644 ...@@ -452,7 +457,7 @@ index 7dc8b2ac5..a2d1ee616 100644
return kConfigGPUDeviceID; return kConfigGPUDeviceID;
for (int32_t i = 0; i < kNumberOfExactMatchTokens; ++i) { for (int32_t i = 0; i < kNumberOfExactMatchTokens; ++i) {
@@ -211,8 +241,8 @@ bool GPUTestExpectationsParser::LoadTestExpectations(const std::string& data) { @@ -211,8 +241,8 @@ bool GPUTestExpectationsParser::LoadTest
return rt; return rt;
} }
...@@ -463,7 +468,7 @@ index 7dc8b2ac5..a2d1ee616 100644 ...@@ -463,7 +468,7 @@ index 7dc8b2ac5..a2d1ee616 100644
entries_.clear(); entries_.clear();
error_messages_.clear(); error_messages_.clear();
@@ -542,20 +572,17 @@ bool GPUTestExpectationsParser::DetectConflictsBetweenEntries() { @@ -542,20 +572,17 @@ bool GPUTestExpectationsParser::DetectCo
void GPUTestExpectationsParser::PushErrorMessage( void GPUTestExpectationsParser::PushErrorMessage(
const std::string& message, size_t line_number) { const std::string& message, size_t line_number) {
...@@ -489,10 +494,9 @@ index 7dc8b2ac5..a2d1ee616 100644 ...@@ -489,10 +494,9 @@ index 7dc8b2ac5..a2d1ee616 100644
} }
GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry() GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
diff --git a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h diff -u -rupN gpu_test_expectations_reverted/gpu_test_expectations_parser.h gpu_test_expectations/gpu_test_expectations_parser.h
index d943e44ca..8a56e3da6 100644 --- gpu_test_expectations_reverted/gpu_test_expectations_parser.h 2017-10-30 14:30:35.000000000 -0400
--- a/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h +++ gpu_test_expectations/gpu_test_expectations_parser.h 2017-09-11 17:18:07.000000000 -0400
+++ b/src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -516,7 +520,7 @@ index d943e44ca..8a56e3da6 100644 ...@@ -516,7 +520,7 @@ index d943e44ca..8a56e3da6 100644
namespace gpu { namespace gpu {
@@ -34,7 +33,7 @@ class GPU_EXPORT GPUTestExpectationsParser { @@ -34,7 +33,7 @@ class GPU_EXPORT GPUTestExpectationsPars
// save all the entries. Otherwise, generate error messages. // save all the entries. Otherwise, generate error messages.
// Return true if parsing succeeds. // Return true if parsing succeeds.
bool LoadTestExpectations(const std::string& data); bool LoadTestExpectations(const std::string& data);
...@@ -525,7 +529,7 @@ index d943e44ca..8a56e3da6 100644 ...@@ -525,7 +529,7 @@ index d943e44ca..8a56e3da6 100644
// Query error messages from the last LoadTestExpectations() call. // Query error messages from the last LoadTestExpectations() call.
const std::vector<std::string>& GetErrorMessages() const; const std::vector<std::string>& GetErrorMessages() const;
@@ -87,5 +86,5 @@ class GPU_EXPORT GPUTestExpectationsParser { @@ -87,5 +86,5 @@ class GPU_EXPORT GPUTestExpectationsPars
} // namespace gpu } // namespace gpu
......
src/tests/third_party/gpu_test_expectations/gpu_test_config.cc
...@@ -78,8 +78,7 @@ GPUTestConfig::OS GetCurrentOS() { ...@@ -78,8 +78,7 @@ GPUTestConfig::OS GetCurrentOS() {
int32_t major_version = 0; int32_t major_version = 0;
int32_t minor_version = 0; int32_t minor_version = 0;
int32_t bugfix_version = 0; int32_t bugfix_version = 0;
base::SysInfo::OperatingSystemVersionNumbers( angle::GetOperatingSystemVersionNumbers(&major_version, &minor_version, &bugfix_version);
&major_version, &minor_version, &bugfix_version);
if (major_version == 10) { if (major_version == 10) {
switch (minor_version) { switch (minor_version) {
case 5: case 5:
......
src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.h
...@@ -12,16 +12,13 @@ ...@@ -12,16 +12,13 @@
#include "gpu_info.h" #include "gpu_info.h"
namespace base { namespace angle
class SysInfo
{ {
public:
static void OperatingSystemVersionNumbers(int32_t *major_version,
int32_t *minor_version,
int32_t *bugfix_version);
};
} // namespace base void GetOperatingSystemVersionNumbers(int32_t *major_version,
int32_t *minor_version,
int32_t *bugfix_version);
} // namespace angle
#endif // ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_ #endif // ANGLE_GPU_TEST_EXPECTATIONS_GPU_TEST_CONFIG_MAC_H_
src/tests/third_party/gpu_test_expectations/gpu_test_config_mac.mm
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
namespace base {
// OSX 10.8 deprecates Gestalt but doesn't make the operatingSystemVersion property part of the // OSX 10.8 deprecates Gestalt but doesn't make the operatingSystemVersion property part of the
// public interface of NSProcessInfo until 10.10. Add a forward declaration. // public interface of NSProcessInfo until 10.10. Add a forward declaration.
#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 #if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
...@@ -19,20 +17,33 @@ namespace base { ...@@ -19,20 +17,33 @@ namespace base {
@end @end
#endif #endif
void SysInfo::OperatingSystemVersionNumbers(int32_t *major_version, namespace angle
int32_t *minor_version, {
int32_t *bugfix_version)
void GetOperatingSystemVersionNumbers(int32_t *major_version,
int32_t *minor_version,
int32_t *bugfix_version)
{ {
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
Gestalt(gestaltSystemVersionMajor, reinterpret_cast<SInt32*>(major_version)); Gestalt(gestaltSystemVersionMajor, reinterpret_cast<SInt32 *>(major_version));
Gestalt(gestaltSystemVersionMinor, reinterpret_cast<SInt32*>(minor_version)); Gestalt(gestaltSystemVersionMinor, reinterpret_cast<SInt32 *>(minor_version));
Gestalt(gestaltSystemVersionBugFix, reinterpret_cast<SInt32*>(bugfix_version)); Gestalt(gestaltSystemVersionBugFix, reinterpret_cast<SInt32 *>(bugfix_version));
#else #else
NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; if (@available(macOS 10.10, *))
*major_version = version.majorVersion; {
*minor_version = version.minorVersion; NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
*bugfix_version = version.patchVersion; *major_version = version.majorVersion;
*minor_version = version.minorVersion;
*bugfix_version = version.patchVersion;
}
else
{
// This can only happen on 10.9
*major_version = 10;
*minor_version = 9;
*bugfix_version = 0;
}
#endif #endif
} }
} // namespace base } // namespace angle
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment