[Bf-blender-cvs] [2fcc028] temp-gtest-testing: Move paths as discussed with Sergey
Campbell Barton
noreply at git.blender.org
Wed Jun 18 17:51:29 CEST 2014
Commit: 2fcc028b6088e79a342a4ed76edd3cf98dd009a4
Author: Campbell Barton
Date: Thu Jun 19 01:49:54 2014 +1000
https://developer.blender.org/rB2fcc028b6088e79a342a4ed76edd3cf98dd009a4
Move paths as discussed with Sergey
===================================================================
M CMakeLists.txt
A build_files/cmake/Modules/GTestTesting.cmake
D build_files/cmake/Modules/Testing.cmake
M extern/libmv/libmv/base/scoped_ptr_test.cc
M extern/libmv/libmv/base/vector_test.cc
M extern/libmv/libmv/image/array_nd_test.cc
M extern/libmv/libmv/image/convolve_test.cc
M extern/libmv/libmv/image/image_test.cc
M extern/libmv/libmv/image/sample_test.cc
M extern/libmv/libmv/image/tuple_test.cc
M extern/libmv/libmv/multiview/euclidean_resection_test.cc
M extern/libmv/libmv/multiview/fundamental_test.cc
M extern/libmv/libmv/multiview/homography_test.cc
M extern/libmv/libmv/multiview/nviewtriangulation_test.cc
M extern/libmv/libmv/multiview/panography_test.cc
M extern/libmv/libmv/multiview/projection_test.cc
M extern/libmv/libmv/multiview/resection_test.cc
M extern/libmv/libmv/multiview/triangulation_test.cc
M extern/libmv/libmv/numeric/dogleg_test.cc
M extern/libmv/libmv/numeric/function_derivative_test.cc
M extern/libmv/libmv/numeric/levenberg_marquardt_test.cc
M extern/libmv/libmv/numeric/numeric_test.cc
M extern/libmv/libmv/numeric/poly_test.cc
M extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc
M extern/libmv/libmv/simple_pipeline/detect_test.cc
M extern/libmv/libmv/simple_pipeline/intersect_test.cc
M extern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc
M extern/libmv/libmv/simple_pipeline/modal_solver_test.cc
M extern/libmv/libmv/simple_pipeline/resect_test.cc
M extern/libmv/libmv/tracking/brute_region_tracker_test.cc
M extern/libmv/libmv/tracking/klt_region_tracker_test.cc
M extern/libmv/libmv/tracking/pyramid_region_tracker_test.cc
M tests/CMakeLists.txt
D tests/gtest/CMakeLists.txt
D tests/gtest/testing.h
D tests/gtest/testing_main.cc
D tests/gtest_blenlib/BLI_math_color_test.cc
D tests/gtest_blenlib/BLI_math_geom_test.cc
D tests/gtest_blenlib/BLI_path_util_test.cc
D tests/gtest_blenlib/CMakeLists.txt
A tests/gtests/CMakeLists.txt
A tests/gtests/blenlib/BLI_math_color_test.cc
A tests/gtests/blenlib/BLI_math_geom_test.cc
A tests/gtests/blenlib/BLI_path_util_test.cc
A tests/gtests/blenlib/CMakeLists.txt
A tests/gtests/testing/CMakeLists.txt
A tests/gtests/testing/testing.h
A tests/gtests/testing/testing_main.cc
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf92b23..8bc6922 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2335,7 +2335,7 @@ endif()
# Libraries
if(WITH_TESTS)
- include(Testing)
+ include(GTestTesting)
endif()
if(WITH_BLENDER OR WITH_PLAYER)
diff --git a/build_files/cmake/Modules/Testing.cmake b/build_files/cmake/Modules/GTestTesting.cmake
similarity index 98%
rename from build_files/cmake/Modules/Testing.cmake
rename to build_files/cmake/Modules/GTestTesting.cmake
index 9011923..01f313c 100644
--- a/build_files/cmake/Modules/Testing.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -19,7 +19,7 @@ macro(BLENDER_SRC_TEST NAME SRC EXTRA_LIBS)
PROPERTY INCLUDE_DIRECTORIES)
set(TEST_INC
${_current_include_directories}
- ${CMAKE_SOURCE_DIR}/tests
+ ${CMAKE_SOURCE_DIR}/tests/gtests
${CMAKE_SOURCE_DIR}/extern/libmv/third_party/glog/src
${CMAKE_SOURCE_DIR}/extern/libmv/third_party/gflags
${CMAKE_SOURCE_DIR}/extern/gtest/include
diff --git a/extern/libmv/libmv/base/scoped_ptr_test.cc b/extern/libmv/libmv/base/scoped_ptr_test.cc
index 3e81ef4..ce1d56b 100644
--- a/extern/libmv/libmv/base/scoped_ptr_test.cc
+++ b/extern/libmv/libmv/base/scoped_ptr_test.cc
@@ -19,7 +19,7 @@
// IN THE SOFTWARE.
#include "libmv/base/scoped_ptr.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
namespace libmv {
namespace {
diff --git a/extern/libmv/libmv/base/vector_test.cc b/extern/libmv/libmv/base/vector_test.cc
index d7c25f8..f17718c 100644
--- a/extern/libmv/libmv/base/vector_test.cc
+++ b/extern/libmv/libmv/base/vector_test.cc
@@ -20,7 +20,7 @@
#include "libmv/base/vector.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
#include <algorithm>
namespace {
diff --git a/extern/libmv/libmv/image/array_nd_test.cc b/extern/libmv/libmv/image/array_nd_test.cc
index 068afee..313f21b 100644
--- a/extern/libmv/libmv/image/array_nd_test.cc
+++ b/extern/libmv/libmv/image/array_nd_test.cc
@@ -19,7 +19,7 @@
// IN THE SOFTWARE.
#include "libmv/image/array_nd.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
using libmv::ArrayND;
using libmv::Array3D;
diff --git a/extern/libmv/libmv/image/convolve_test.cc b/extern/libmv/libmv/image/convolve_test.cc
index cab45ec..0cdef8e 100644
--- a/extern/libmv/libmv/image/convolve_test.cc
+++ b/extern/libmv/libmv/image/convolve_test.cc
@@ -23,7 +23,7 @@
#include "libmv/image/convolve.h"
#include "libmv/image/image.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
using namespace libmv;
diff --git a/extern/libmv/libmv/image/image_test.cc b/extern/libmv/libmv/image/image_test.cc
index 233d865..241f49f 100644
--- a/extern/libmv/libmv/image/image_test.cc
+++ b/extern/libmv/libmv/image/image_test.cc
@@ -21,7 +21,7 @@
#include <iostream>
#include "libmv/image/image.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
using libmv::Image;
using libmv::Array3Df;
diff --git a/extern/libmv/libmv/image/sample_test.cc b/extern/libmv/libmv/image/sample_test.cc
index e51f0f3..c8a0ce4 100644
--- a/extern/libmv/libmv/image/sample_test.cc
+++ b/extern/libmv/libmv/image/sample_test.cc
@@ -19,7 +19,7 @@
// IN THE SOFTWARE.
#include "libmv/image/sample.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
using namespace libmv;
diff --git a/extern/libmv/libmv/image/tuple_test.cc b/extern/libmv/libmv/image/tuple_test.cc
index 903d4c3..df44e56 100644
--- a/extern/libmv/libmv/image/tuple_test.cc
+++ b/extern/libmv/libmv/image/tuple_test.cc
@@ -19,7 +19,7 @@
// IN THE SOFTWARE.
#include "libmv/image/tuple.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
#include <algorithm>
diff --git a/extern/libmv/libmv/multiview/euclidean_resection_test.cc b/extern/libmv/libmv/multiview/euclidean_resection_test.cc
index 8d1250e..5ec9dbd 100644
--- a/extern/libmv/libmv/multiview/euclidean_resection_test.cc
+++ b/extern/libmv/libmv/multiview/euclidean_resection_test.cc
@@ -22,7 +22,7 @@
#include "libmv/numeric/numeric.h"
#include "libmv/logging/logging.h"
#include "libmv/multiview/projection.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
using namespace libmv::euclidean_resection;
using namespace libmv;
diff --git a/extern/libmv/libmv/multiview/fundamental_test.cc b/extern/libmv/libmv/multiview/fundamental_test.cc
index 920614a..da0eb44 100644
--- a/extern/libmv/libmv/multiview/fundamental_test.cc
+++ b/extern/libmv/libmv/multiview/fundamental_test.cc
@@ -26,7 +26,7 @@
#include "libmv/multiview/projection.h"
#include "libmv/multiview/test_data_sets.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
namespace {
diff --git a/extern/libmv/libmv/multiview/homography_test.cc b/extern/libmv/libmv/multiview/homography_test.cc
index 2b34763..8d7266e 100644
--- a/extern/libmv/libmv/multiview/homography_test.cc
+++ b/extern/libmv/libmv/multiview/homography_test.cc
@@ -18,7 +18,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
-#include "gtest/testing.h"
+#include "testing/testing.h"
#include "libmv/logging/logging.h"
#include "libmv/multiview/projection.h"
#include "libmv/multiview/homography.h"
diff --git a/extern/libmv/libmv/multiview/nviewtriangulation_test.cc b/extern/libmv/libmv/multiview/nviewtriangulation_test.cc
index 692feb4..5a4d849 100644
--- a/extern/libmv/libmv/multiview/nviewtriangulation_test.cc
+++ b/extern/libmv/libmv/multiview/nviewtriangulation_test.cc
@@ -26,7 +26,7 @@
#include "libmv/multiview/projection.h"
#include "libmv/multiview/test_data_sets.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
namespace {
diff --git a/extern/libmv/libmv/multiview/panography_test.cc b/extern/libmv/libmv/multiview/panography_test.cc
index 73ad769..f6faf0f 100644
--- a/extern/libmv/libmv/multiview/panography_test.cc
+++ b/extern/libmv/libmv/multiview/panography_test.cc
@@ -23,7 +23,7 @@
#include "libmv/multiview/panography_kernel.h"
#include "libmv/multiview/projection.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
namespace libmv {
namespace {
diff --git a/extern/libmv/libmv/multiview/projection_test.cc b/extern/libmv/libmv/multiview/projection_test.cc
index d94764e..c060bfb 100644
--- a/extern/libmv/libmv/multiview/projection_test.cc
+++ b/extern/libmv/libmv/multiview/projection_test.cc
@@ -22,7 +22,7 @@
#include "libmv/multiview/projection.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
namespace {
using namespace libmv;
diff --git a/extern/libmv/libmv/multiview/resection_test.cc b/extern/libmv/libmv/multiview/resection_test.cc
index a1888ea..368e228 100644
--- a/extern/libmv/libmv/multiview/resection_test.cc
+++ b/extern/libmv/libmv/multiview/resection_test.cc
@@ -24,7 +24,7 @@
#include "libmv/multiview/resection.h"
#include "libmv/multiview/test_data_sets.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
#include "libmv/logging/logging.h"
namespace {
diff --git a/extern/libmv/libmv/multiview/triangulation_test.cc b/extern/libmv/libmv/multiview/triangulation_test.cc
index 314cb3f..66d1ee2 100644
--- a/extern/libmv/libmv/multiview/triangulation_test.cc
+++ b/extern/libmv/libmv/multiview/triangulation_test.cc
@@ -25,7 +25,7 @@
#include "libmv/multiview/projection.h"
#include "libmv/multiview/test_data_sets.h"
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
namespace {
using namespace libmv;
diff --git a/extern/libmv/libmv/numeric/dogleg_test.cc b/extern/libmv/libmv/numeric/dogleg_test.cc
index 6cbf362..90c46c3 100644
--- a/extern/libmv/libmv/numeric/dogleg_test.cc
+++ b/extern/libmv/libmv/numeric/dogleg_test.cc
@@ -18,7 +18,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
-#include "gtest/testing.h"
+#include "testing/testing.h"
#include "libmv/numeric/dogleg.h"
using namespace libmv;
diff --git a/extern/libmv/libmv/numeric/function_derivative_test.cc b/extern/libmv/libmv/numeric/function_derivative_test.cc
index 749cdf1..8d976d3 100644
--- a/extern/libmv/libmv/numeric/function_derivative_test.cc
+++ b/extern/libmv/libmv/numeric/function_derivative_test.cc
@@ -18,7 +18,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
-#include "gtest/testing.h"
+#include "testing/testing.h"
#include "libmv/numeric/numeric.h"
#include "libmv/numeric/function_derivative.h"
diff --git a/extern/libmv/libmv/numeric/levenberg_marquardt_test.cc b/extern/libmv/libmv/numeric/levenberg_marquardt_test.cc
index 82a15cd..fc3f9eb 100644
--- a/extern/libmv/libmv/numeric/levenberg_marquardt_test.cc
+++ b/extern/libmv/libmv/numeric/levenberg_marquardt_test.cc
@@ -18,7 +18,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
-#include "gtest/testing.h"
+#include "testing/testing.h"
#include "libmv/numeric/levenberg_marquardt.h"
using namespace libmv;
diff --git a/extern/libmv/libmv/numeric/numeric_test.cc b/extern/libmv/libmv/numeric/numeric_test.cc
index 3a9001b..0cdfaf3 100644
--- a/extern/libmv/libmv/numeric/numeric_test.cc
+++ b/extern/libmv/libmv/numeric/numeric_test.cc
@@ -19,7 +19,7 @@
// IN THE SOFTWARE.
#include "libmv/numeric/numeric.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
using namespace libmv;
diff --git a/extern/libmv/libmv/numeric/poly_test.cc b/extern/libmv/libmv/numeric/poly_test.cc
index 872c53e..ea50383 100644
--- a/extern/libmv/libmv/numeric/poly_test.cc
+++ b/extern/libmv/libmv/numeric/poly_test.cc
@@ -20,7 +20,7 @@
#include "libmv/numeric/numeric.h"
#include "libmv/numeric/poly.h"
-#include "gtest/testing.h"
+#include "testing/testing.h"
using namespace libmv;
diff --git a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc b/extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc
index 4a3ebe0..96d35a2 10064
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list