diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /tests | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/blenlib/BLI_array_utils_test.cc | 1 | ||||
-rw-r--r-- | tests/gtests/guardedalloc/guardedalloc_overflow_test.cc | 1 | ||||
-rw-r--r-- | tests/gtests/testing/testing_main.cc | 1 | ||||
-rwxr-xr-x | tests/python/modules/render_report.py | 1 | ||||
-rwxr-xr-x | tests/python/modules/test_utils.py | 1 | ||||
-rw-r--r-- | tests/python/rna_array.py | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/tests/gtests/blenlib/BLI_array_utils_test.cc b/tests/gtests/blenlib/BLI_array_utils_test.cc index c4601e00fbd..6daa400a478 100644 --- a/tests/gtests/blenlib/BLI_array_utils_test.cc +++ b/tests/gtests/blenlib/BLI_array_utils_test.cc @@ -187,4 +187,3 @@ TEST(array_utils, BinaryOrInt4Mix) BINARY_OR_TEST(data_cmp, data_a, data_b, data_combine, ARRAY_SIZE(data_cmp)); } #undef BINARY_OR_TEST - diff --git a/tests/gtests/guardedalloc/guardedalloc_overflow_test.cc b/tests/gtests/guardedalloc/guardedalloc_overflow_test.cc index 18cf57bd6ea..6f4df4fd047 100644 --- a/tests/gtests/guardedalloc/guardedalloc_overflow_test.cc +++ b/tests/gtests/guardedalloc/guardedalloc_overflow_test.cc @@ -58,4 +58,3 @@ TEST(guardedalloc, GuardedIntegerOverflow) EXPECT_EXIT(MallocArray(SIZE_MAX, 12345567), ABORT_PREDICATE, ""); EXPECT_EXIT(CallocArray(SIZE_MAX, SIZE_MAX), ABORT_PREDICATE, ""); } - diff --git a/tests/gtests/testing/testing_main.cc b/tests/gtests/testing/testing_main.cc index e8104a2a026..6f506d1a0cf 100644 --- a/tests/gtests/testing/testing_main.cc +++ b/tests/gtests/testing/testing_main.cc @@ -33,4 +33,3 @@ int main(int argc, char **argv) { return RUN_ALL_TESTS(); } - diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py index 2e7a092b3d8..425e6d59fa0 100755 --- a/tests/python/modules/render_report.py +++ b/tests/python/modules/render_report.py @@ -444,4 +444,3 @@ class Report: print_message("{}" . format(test), 'FAILURE', "FAILED") return not bool(failed_tests) - diff --git a/tests/python/modules/test_utils.py b/tests/python/modules/test_utils.py index c4496c3e3ac..2b762b4122c 100755 --- a/tests/python/modules/test_utils.py +++ b/tests/python/modules/test_utils.py @@ -102,4 +102,3 @@ class AbstractBlenderRunnerTest(unittest.TestCase): self.fail('Error %d running Blender:\n%s' % (proc.returncode, output)) return output - diff --git a/tests/python/rna_array.py b/tests/python/rna_array.py index dda13d2c3ae..0f6c0ce0a57 100644 --- a/tests/python/rna_array.py +++ b/tests/python/rna_array.py @@ -278,4 +278,3 @@ def suite(): if __name__ == "__main__": unittest.TextTestRunner(verbosity=2).run(suite()) - |