Cleanup: Cycles: Use gtest header instead of Blender test header
To avoid conflicts with glog logging macros, and because there is just no need to have this dependency. Pull Request: https://projects.blender.org/blender/blender/pulls/143719
This commit is contained in:
committed by
Brecht Van Lommel
parent
97b5618911
commit
cedd7edd29
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "integrator/adaptive_sampling.h"
|
||||
#include "util/vector.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "integrator/render_scheduler.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "integrator/tile.h"
|
||||
#include "util/math.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/math.h"
|
||||
#include "util/types.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/aligned_malloc.h"
|
||||
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/boundbox.h"
|
||||
|
||||
#include "testing/testing.h"
|
||||
|
||||
#include "util/transform.h"
|
||||
|
||||
CCL_NAMESPACE_BEGIN
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/math.h"
|
||||
#include "util/system.h"
|
||||
#include "util/types.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/ies.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/math.h"
|
||||
#include "util/math_fast.h"
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
/* Note: These fixtures test default micro-architecture optimization defined in the
|
||||
* util/optimization.h. */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/math.h"
|
||||
#include "util/system.h"
|
||||
|
||||
CCL_NAMESPACE_BEGIN
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
/* Note: These fixtures test default micro-architecture optimization defined in the
|
||||
* util/optimization.h. */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/math.h"
|
||||
#include "util/system.h"
|
||||
|
||||
CCL_NAMESPACE_BEGIN
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/math.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/md5.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/path.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/string.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/task.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/time.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0 */
|
||||
|
||||
#include "testing/testing.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "util/transform.h"
|
||||
#include "util/vector.h"
|
||||
|
||||
Reference in New Issue
Block a user