Commit 939195a0 by James Darpinian Committed by Commit Bot

Skip tests using unimplemented features on iOS

Bug: angleproject:5485 Change-Id: I3248126060b9957596f65221c60f42f213e9a9dc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2601377Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Commit-Queue: James Darpinian <jdarpinian@chromium.org>
parent 7061af26
......@@ -403,6 +403,9 @@ TEST_P(EGLSurfaceTest, MessageLoopBug)
// http://anglebug.com/3138
ANGLE_SKIP_TEST_IF(IsOzone());
// http://anglebug.com/5485
ANGLE_SKIP_TEST_IF(IsIOS());
initializeDisplay();
initializeSurfaceWithDefaultConfig(true);
......@@ -419,6 +422,9 @@ TEST_P(EGLSurfaceTest, MessageLoopBugContext)
// http://anglebug.com/3138
ANGLE_SKIP_TEST_IF(IsOzone());
// http://anglebug.com/5485
ANGLE_SKIP_TEST_IF(IsIOS());
initializeDisplay();
initializeSurfaceWithDefaultConfig(true);
......@@ -449,6 +455,8 @@ TEST_P(EGLSurfaceTest, ResizeWindow)
ANGLE_SKIP_TEST_IF(isVulkanRenderer() && IsLinux() && IsIntel());
// Flaky on Linux SwANGLE http://anglebug.com/4453
ANGLE_SKIP_TEST_IF(IsLinux() && isSwiftshader());
// http://anglebug.com/5485
ANGLE_SKIP_TEST_IF(IsIOS());
// Necessary for a window resizing test if there is no per-frame window size query
setWindowVisible(mOSWindow, true);
......@@ -502,6 +510,8 @@ TEST_P(EGLSurfaceTest, ResizeWindowWithDraw)
{
// http://anglebug.com/4453
ANGLE_SKIP_TEST_IF(IsLinux());
// http://anglebug.com/5485
ANGLE_SKIP_TEST_IF(IsIOS());
// Necessary for a window resizing test if there is no per-frame window size query
setWindowVisible(mOSWindow, true);
......
......@@ -160,10 +160,20 @@ inline bool IsWin10()
return false;
}
// Check if the OS is any version of iOS
inline bool IsIOS()
{
#if defined(ANGLE_PLATFORM_IOS)
return true;
#else
return false;
#endif
}
// Check if the OS is any version of OSX
inline bool IsMac()
{
#if defined(ANGLE_PLATFORM_APPLE)
#if defined(ANGLE_PLATFORM_MACOS)
return true;
#else
return false;
......@@ -547,6 +557,7 @@ GPUTestConfig::GPUTestConfig()
mConditions[kConditionMacHighSierra] = IsMacHighSierra();
mConditions[kConditionMacMojave] = IsMacMojave();
mConditions[kConditionMac] = IsMac();
mConditions[kConditionIOS] = IsIOS();
mConditions[kConditionLinux] = IsLinux();
mConditions[kConditionAndroid] = IsAndroid();
mConditions[kConditionNVIDIA] = IsNVIDIA();
......
......@@ -47,6 +47,7 @@ struct GPUTestConfig
kConditionMacHighSierra,
kConditionMacMojave,
kConditionMac,
kConditionIOS,
kConditionLinux,
kConditionAndroid,
kConditionNVIDIA,
......
......@@ -53,6 +53,7 @@ enum Token
kConfigMacHighSierra,
kConfigMacMojave,
kConfigMac,
kConfigIOS,
kConfigLinux,
kConfigChromeOS,
kConfigAndroid,
......@@ -153,6 +154,7 @@ constexpr TokenInfo kTokenData[kNumberOfTokens] = {
{"highsierra", GPUTestConfig::kConditionMacHighSierra},
{"mojave", GPUTestConfig::kConditionMacMojave},
{"mac", GPUTestConfig::kConditionMac},
{"ios", GPUTestConfig::kConditionIOS},
{"linux", GPUTestConfig::kConditionLinux},
{"chromeos", GPUTestConfig::kConditionNone}, // https://anglebug.com/3363 CrOS not supported
{"android", GPUTestConfig::kConditionAndroid},
......@@ -428,6 +430,7 @@ bool GPUTestExpectationsParser::parseLine(const GPUTestConfig &config,
case kConfigMacHighSierra:
case kConfigMacMojave:
case kConfigMac:
case kConfigIOS:
case kConfigLinux:
case kConfigChromeOS:
case kConfigAndroid:
......
......@@ -24,6 +24,7 @@ class GPUTestConfigTest : public ANGLETest
{
EXPECT_EQ(IsWindows(), config.getConditions()[GPUTestConfig::kConditionWin]);
EXPECT_EQ(IsOSX(), config.getConditions()[GPUTestConfig::kConditionMac]);
EXPECT_EQ(IsIOS(), config.getConditions()[GPUTestConfig::kConditionIOS]);
EXPECT_EQ(IsLinux(), config.getConditions()[GPUTestConfig::kConditionLinux]);
EXPECT_EQ(IsAndroid(), config.getConditions()[GPUTestConfig::kConditionAndroid]);
EXPECT_EQ(IsNexus5X(), config.getConditions()[GPUTestConfig::kConditionNexus5X]);
......
......@@ -214,7 +214,16 @@ bool IsLinux()
bool IsOSX()
{
#if defined(ANGLE_PLATFORM_APPLE)
#if defined(ANGLE_PLATFORM_MACOS)
return true;
#else
return false;
#endif
}
bool IsIOS()
{
#if defined(ANGLE_PLATFORM_IOS)
return true;
#else
return false;
......@@ -425,7 +434,7 @@ bool IsConfigAllowlisted(const SystemInfo &systemInfo, const PlatformParameters
}
#if defined(ANGLE_PLATFORM_APPLE)
if (IsOSX())
if (IsOSX() || IsIOS())
{
// We do not support non-ANGLE bindings on OSX.
if (param.driver != GLESDriverType::AngleEGL)
......
......@@ -23,6 +23,7 @@ struct PlatformParameters;
bool IsAndroid();
bool IsLinux();
bool IsOSX();
bool IsIOS();
bool IsOzone();
bool IsWindows();
bool IsWindows7();
......
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