[Bf-blender-cvs] [a501668] master: Revert "Cycles Tests: Add test for correct 16 byte alignment of KernelData structs"

Sergey Sharybin noreply at git.blender.org
Thu Aug 11 10:47:55 CEST 2016


Commit: a501668cc5f11f15af9fb47ea3c8c7fc910e8722
Author: Sergey Sharybin
Date:   Thu Aug 11 10:08:23 2016 +0200
Branches: master
https://developer.blender.org/rBa501668cc5f11f15af9fb47ea3c8c7fc910e8722

Revert "Cycles Tests: Add test for correct 16 byte alignment of KernelData structs"

Using unit tests is a wrong way to control static behavior of the
application. They should only be used for checking dynamic behavior,
all the rest is easily controllable at compile time.

Doing tests at ocmpile time are actually more robust approach since
we don't have strict policy of runnign unit tests before accepting
any change.

Proper alignment control is coming shortly.

This reverts commit 7c3a06c34918567e6b0ab67bded60725ff63073b.

===================================================================

M	intern/cycles/test/CMakeLists.txt
D	intern/cycles/test/kernel_struct_align_test.cpp

===================================================================

diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index e973323..9af777f 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -69,4 +69,3 @@ CYCLES_TEST(util_aligned_malloc "cycles_util")
 CYCLES_TEST(util_path "cycles_util;${BOOST_LIBRARIES};${OPENIMAGEIO_LIBRARIES}")
 CYCLES_TEST(util_string "cycles_util;${BOOST_LIBRARIES}")
 CYCLES_TEST(util_task "cycles_util;${BOOST_LIBRARIES}")
-CYCLES_TEST(kernel_struct_align "")
diff --git a/intern/cycles/test/kernel_struct_align_test.cpp b/intern/cycles/test/kernel_struct_align_test.cpp
deleted file mode 100644
index d078b8d..0000000
--- a/intern/cycles/test/kernel_struct_align_test.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011-2016 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "testing/testing.h"
-
-#include "kernel/kernel_types.h"
-
-CCL_NAMESPACE_BEGIN
-
-#define TEST_IS_ALIGNED(name) ((sizeof(name) % 16) == 0)
-
-TEST(kernel_struct_align, KernelCamera)
-{
-	EXPECT_TRUE(TEST_IS_ALIGNED(KernelCamera));
-}
-
-TEST(kernel_struct_align, KernelFilm)
-{
-	EXPECT_TRUE(TEST_IS_ALIGNED(KernelFilm));
-}
-
-TEST(kernel_struct_align, KernelBackground)
-{
-	EXPECT_TRUE(TEST_IS_ALIGNED(KernelBackground));
-}
-
-TEST(kernel_struct_align, KernelIntegrator)
-{
-	EXPECT_TRUE(TEST_IS_ALIGNED(KernelIntegrator));
-}
-
-TEST(kernel_struct_align, KernelBVH)
-{
-	EXPECT_TRUE(TEST_IS_ALIGNED(KernelBVH));
-}
-
-TEST(kernel_struct_align, KernelCurves)
-{
-	EXPECT_TRUE(TEST_IS_ALIGNED(KernelCurves));
-}
-
-TEST(kernel_struct_align, KernelTables)
-{
-	EXPECT_TRUE(TEST_IS_ALIGNED(KernelTables));
-}
-
-CCL_NAMESPACE_END




More information about the Bf-blender-cvs mailing list