Move implementation unit tests to angle_unittests.

src/common/debug.h

@@ -139,7 +139,16 @@ namespace gl
 #endif
 
 // A macro functioning as a compile-time assert to validate constant conditions
-#if (defined(_MSC_VER) && _MSC_VER >= 1600) || (defined(__GNUC__) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 3))
+
+#if (defined(_MSC_VER) && _MSC_VER >= 1600)
+#define ANGLE_HAS_STATIC_ASSERT
+#elif (defined(__GNUC__) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 3))
+#define ANGLE_HAS_STATIC_ASSERT
+#elif defined(__clang__) && __has_feature(cxx_static_assert)
+#define ANGLE_HAS_STATIC_ASSERT
+#endif
+
+#if defined(ANGLE_HAS_STATIC_ASSERT)
 #define META_ASSERT_MSG(condition, msg) static_assert(condition, msg)
 #else
 #define META_ASSERT_CONCAT(a, b) a ## b

src/libANGLE/Fence.h

@@ -24,7 +24,7 @@ class FenceSyncImpl;
 namespace gl
 {
 
-class FenceNV
+class FenceNV final
 {
   public:
     explicit FenceNV(rx::FenceNVImpl *impl);
@@ -36,7 +36,7 @@ class FenceNV
     Error finishFence();
 
     GLboolean getStatus() const { return mStatus; }
-    GLuint getCondition() const { return mCondition; }
+    GLenum getCondition() const { return mCondition; }
 
   private:
     DISALLOW_COPY_AND_ASSIGN(FenceNV);
@@ -49,7 +49,7 @@ class FenceNV
     GLenum mCondition;
 };
 
-class FenceSync : public RefCountObject
+class FenceSync final : public RefCountObject
 {
   public:
     explicit FenceSync(rx::FenceSyncImpl *impl, GLuint id);
@@ -60,7 +60,7 @@ class FenceSync : public RefCountObject
     Error serverWait(GLbitfield flags, GLuint64 timeout);
     Error getStatus(GLint *outResult) const;
 
-    GLuint getCondition() const { return mCondition; }
+    GLenum getCondition() const { return mCondition; }
 
   private:
     DISALLOW_COPY_AND_ASSIGN(FenceSync);

src/libGLESv2/entry_points_gles_2_0_ext.cpp

@@ -262,7 +262,7 @@ void GL_APIENTRY GetFenceivNV(GLuint fence, GLenum pname, GLint *params)
 
           case GL_FENCE_CONDITION_NV:
             {
-                *params = fenceObject->getCondition();
+                *params = static_cast<GLint>(fenceObject->getCondition());
                 break;
             }
 

tests/angle_end2end_tests.gypi

@@ -56,7 +56,6 @@
     },
     'dependencies':
     [
-        '<(angle_path)/src/angle.gyp:libANGLE',
         '<(angle_path)/src/angle.gyp:libEGL',
         '<(angle_path)/src/angle.gyp:libGLESv2',
         '<(angle_path)/tests/tests.gyp:angle_test_support',
@@ -67,11 +66,6 @@
         '../include',
         'angle_tests',
     ],
-    'includes':
-    [
-        # TODO(kbr): move these to angle_unittests.gypi.
-        'angle_implementation_unit_tests/angle_implementation_unit_tests.gypi',
-    ],
     'sources':
     [
         '<@(angle_end2end_tests_sources)',

tests/angle_implementation_unit_tests/Config_unittest.cpp

@@ -108,7 +108,7 @@ TEST(ConfigSetTest, IDs)
 
     // Check that there are no gaps and the IDs are in the range [1, N].
     EXPECT_EQ(*std::min_element(ids.begin(), ids.end()), 1);
-    EXPECT_EQ(*std::max_element(ids.begin(), ids.end()), set.size());
+    EXPECT_EQ(*std::max_element(ids.begin(), ids.end()), static_cast<EGLint>(set.size()));
 }
 
 TEST(ConfigSetTest, Filtering_BitSizes)

tests/angle_implementation_unit_tests/Fence_unittest.cpp

@@ -145,7 +145,7 @@ TEST_F(FenceSyncTest, SetAndGetStatusBehavior)
         .WillOnce(Return(gl::Error(GL_NO_ERROR)))
         .RetiresOnSaturation();
     mFence->set(GL_SYNC_GPU_COMMANDS_COMPLETE);
-    EXPECT_EQ(GL_SYNC_GPU_COMMANDS_COMPLETE, mFence->getCondition());
+    EXPECT_EQ(static_cast<GLenum>(GL_SYNC_GPU_COMMANDS_COMPLETE), mFence->getCondition());
     // Fake the behavior of testing the fence before and after it's passed.
     EXPECT_CALL(*mImpl, getStatus(_))
         .WillOnce(DoAll(SetArgumentPointee<0>(GL_UNSIGNALED),

tests/angle_unittests.gypi

@@ -47,6 +47,7 @@
     },
     'dependencies':
     [
+        '<(angle_path)/src/angle.gyp:libANGLE',
         '<(angle_path)/src/angle.gyp:preprocessor',
         '<(angle_path)/src/angle.gyp:translator_static',
         '<(angle_path)/tests/tests.gyp:angle_test_support',
@@ -57,6 +58,10 @@
         '../src',
         '../src/compiler/preprocessor',
     ],
+    'includes':
+    [
+        'angle_implementation_unit_tests/angle_implementation_unit_tests.gypi',
+    ],
     'sources':
     [
         '<@(angle_unittests_sources)',