[Bf-blender-cvs] [82d4e5a] temp-gtest-testing: Move tests/testing/ -> tests/gtest/

Campbell Barton Wed, 18 Jun 2014 06:18:21 -0700

Commit: 82d4e5ab1a95bff59c465e87a73f8437df79fe43
Author: Campbell Barton
Date:   Wed Jun 18 23:17:14 2014 +1000
https://developer.blender.org/rB82d4e5ab1a95bff59c465e87a73f8437df79fe43


Move tests/testing/ -> tests/gtest/

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

M       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/blenlib_tests/CMakeLists.txt
D       tests/blenlib_tests/mathutils_color_test.cc
D       tests/blenlib_tests/mathutils_geom_test.cc
D       tests/blenlib_tests/path_util_test.cc
A       tests/gtest/CMakeLists.txt
A       tests/gtest/testing.h
A       tests/gtest/testing_main.cc
A       tests/gtest_blenlib/CMakeLists.txt
A       tests/gtest_blenlib/mathutils_color_test.cc
A       tests/gtest_blenlib/mathutils_geom_test.cc
A       tests/gtest_blenlib/path_util_test.cc
D       tests/testing/CMakeLists.txt
D       tests/testing/testing.h
D       tests/testing/testing_main.cc

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

diff --git a/build_files/cmake/Modules/Testing.cmake 
b/build_files/cmake/Modules/Testing.cmake
index 2e14d6e..9011923 100644
--- a/build_files/cmake/Modules/Testing.cmake
+++ b/build_files/cmake/Modules/Testing.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}/source/tests
+                       ${CMAKE_SOURCE_DIR}/tests
                        ${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 ce1d56b..3e81ef4 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 "testing/testing.h"
+#include "gtest/testing.h"
 
 namespace libmv {
 namespace {
diff --git a/extern/libmv/libmv/base/vector_test.cc 
b/extern/libmv/libmv/base/vector_test.cc
index f17718c..d7c25f8 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 "testing/testing.h"
+#include "gtest/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 313f21b..068afee 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 "testing/testing.h"
+#include "gtest/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 0cdef8e..cab45ec 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 "testing/testing.h"
+#include "gtest/testing.h"
 
 using namespace libmv;
 
diff --git a/extern/libmv/libmv/image/image_test.cc 
b/extern/libmv/libmv/image/image_test.cc
index 241f49f..233d865 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 "testing/testing.h"
+#include "gtest/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 c8a0ce4..e51f0f3 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 "testing/testing.h"
+#include "gtest/testing.h"
 
 using namespace libmv;
 
diff --git a/extern/libmv/libmv/image/tuple_test.cc 
b/extern/libmv/libmv/image/tuple_test.cc
index df44e56..903d4c3 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 "testing/testing.h"
+#include "gtest/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 5ec9dbd..8d1250e 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 "testing/testing.h"
+#include "gtest/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 da0eb44..920614a 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 "testing/testing.h"
+#include "gtest/testing.h"
 
 namespace {
 
diff --git a/extern/libmv/libmv/multiview/homography_test.cc 
b/extern/libmv/libmv/multiview/homography_test.cc
index 8d7266e..2b34763 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 "testing/testing.h"
+#include "gtest/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 5a4d849..692feb4 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 "testing/testing.h"
+#include "gtest/testing.h"
 
 namespace {
 
diff --git a/extern/libmv/libmv/multiview/panography_test.cc 
b/extern/libmv/libmv/multiview/panography_test.cc
index f6faf0f..73ad769 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 "testing/testing.h"
+#include "gtest/testing.h"
 
 namespace libmv {
 namespace {
diff --git a/extern/libmv/libmv/multiview/projection_test.cc 
b/extern/libmv/libmv/multiview/projection_test.cc
index c060bfb..d94764e 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 "testing/testing.h"
+#include "gtest/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 368e228..a1888ea 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 "testing/testing.h"
+#include "gtest/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 66d1ee2..314cb3f 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 "testing/testing.h"
+#include "gtest/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 90c46c3..6cbf362 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 "testing/testing.h"
+#include "gtest/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 8d976d3..749cdf1 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 "testing/testing.h"
+#include "gtest/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 fc3f9eb..82a15cd 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 "testing/testing.h"
+#include "gtest/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 0cdfaf3..3a9001b 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 "testing/testing.h"
+#include "gtest/testing.h"
 
 using namespace libmv;
 
diff --git a/extern/libmv/libmv/numeric/poly_test.cc 
b/extern/libmv/libmv/numeric/poly_test.cc
index ea50383..872c53e 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 "testing/testing.h"
+#include "gtest/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 96d35a2..4a3ebe0 100644
--- a/extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc
+++ b/extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc
@@ -22,7 +22,7 @@
 
 #include <iostream>
 
-#include "testing/testing.h"
+#include "gtest/testing.h"
 #include "libmv/image/image.h"
 #include "libmv/image/image_drawing.h"
 #include "libmv/logging/logging.h"
diff --git a/extern/libmv/libmv/simple_pipeline/detect_tes

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [82d4e5a] temp-gtest-testing: Move tests/testing/ -> tests/gtest/

Reply via email to