Merge vk-gl-cts/vulkan-cts-1.0.0 into vk-gl-cts/vulkan-cts-1.0.1
authorPyry Haulos <phaulos@google.com>
Wed, 12 Apr 2017 03:43:22 +0000 (11:43 +0800)
committerPyry Haulos <phaulos@google.com>
Wed, 12 Apr 2017 03:43:22 +0000 (11:43 +0800)
Change-Id: Iff109ea0dba048599d3deb4d8f42a7cac8b62283

1  2 
modules/internal/ditBuildInfoTests.cpp

@@@ -187,13 -187,15 +187,13 @@@ void BuildInfoTests::init (void
        const bool isDebug = false;
  #endif
  
 -      addChild(new BuildInfoStringCase                (m_testCtx, "date",                                             "__DATE__",                     __DATE__));
 -      addChild(new BuildInfoStringCase                (m_testCtx, "time",                                             "__TIME__",                     __TIME__));
        addChild(new BuildInfoStringCase                (m_testCtx, "de_debug",                                 "DE_DEBUG",                     isDebug ? "1" : "not defined"));
        addChild(new BuildEnumCase                              (m_testCtx, "de_os",                                    "DE_OS",                        DE_OS,                                                                  getOsName));
        addChild(new BuildEnumCase                              (m_testCtx, "de_cpu",                                   "DE_CPU",                       DE_CPU,                                                                 getCpuName));
        addChild(new BuildEnumCase                              (m_testCtx, "de_compiler",                              "DE_COMPILER",          DE_COMPILER,                                                    getCompilerName));
        addChild(new BuildInfoStringCase                (m_testCtx, "de_ptr_size",                              "DE_PTR_SIZE",          de::toString(DE_PTR_SIZE).c_str()));
        addChild(new BuildEnumCase                              (m_testCtx, "de_endianness",                    "DE_ENDIANNESS",        DE_ENDIANNESS,                                                  getEndiannessName));
-       addChild(new EndiannessConsistencyCase  (m_testCtx, "de_endianness_consitent",  "DE_ENDIANNESS"));
+       addChild(new EndiannessConsistencyCase  (m_testCtx, "de_endianness_consistent", "DE_ENDIANNESS"));
  }
  
  } // dit