Repository: lucy-clownfish Updated Branches: refs/heads/master 5055c1ae2 -> 5646bf057
Skip tests with memory leaks under valgrind. Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/532c6d6c Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/532c6d6c Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/532c6d6c Branch: refs/heads/master Commit: 532c6d6cfe68a79d7556aa910b64a87a1b4282b4 Parents: cf94088 Author: Marvin Humphrey <[email protected]> Authored: Fri Feb 6 10:51:29 2015 -0800 Committer: Marvin Humphrey <[email protected]> Committed: Sat Feb 7 07:36:32 2015 -0800 ---------------------------------------------------------------------- runtime/core/Clownfish/Test/TestVArray.c | 5 +++++ runtime/perl/t/binding/019-obj.t | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/532c6d6c/runtime/core/Clownfish/Test/TestVArray.c ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Test/TestVArray.c b/runtime/core/Clownfish/Test/TestVArray.c index 923d637..10255f7 100644 --- a/runtime/core/Clownfish/Test/TestVArray.c +++ b/runtime/core/Clownfish/Test/TestVArray.c @@ -15,6 +15,7 @@ */ #include <string.h> +#include <stdlib.h> #define C_CFISH_VARRAY #define CFISH_USE_SHORT_NAMES @@ -341,6 +342,10 @@ S_test_exception(TestBatchRunner *runner, Err_Attempt_t func, static void test_exceptions(TestBatchRunner *runner) { + if (getenv("LUCY_VALGRIND")) { + SKIP(runner, 4, "memory leak"); + return; + } S_test_exception(runner, S_overflow_Push, "Push throws on overflow"); S_test_exception(runner, S_overflow_Unshift, http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/532c6d6c/runtime/perl/t/binding/019-obj.t ---------------------------------------------------------------------- diff --git a/runtime/perl/t/binding/019-obj.t b/runtime/perl/t/binding/019-obj.t index c548634..06e3642 100644 --- a/runtime/perl/t/binding/019-obj.t +++ b/runtime/perl/t/binding/019-obj.t @@ -120,7 +120,7 @@ like( $object->to_string, qr/STRING:.*?SonOfTestObj/, "overridden XS bindings can be called via SUPER" ); SKIP: { - skip( "Exception thrown within callback leaks", 1 ) + skip( "Exception thrown within callback leaks", 2 ) if $ENV{LUCY_VALGRIND}; # The Perl binding for VArray#store calls inc_refcount() from C space. @@ -132,10 +132,10 @@ SKIP: { eval { $array->store( 1, BadRefCount->new ); }; like( $@, qr/NULL/, "Don't allow methods without nullable return values to return NULL" ); -} -eval { InvalidCallbackTestObj->new; }; -like( $@, qr/Can't override CFISH_Obj_To_Host via binding/ ); + eval { InvalidCallbackTestObj->new; }; + like( $@, qr/Can't override CFISH_Obj_To_Host via binding/ ); +} my $alias_test = Clownfish::Test::AliasTestObj->new; is( $alias_test->perl_alias, 'C', "Host method aliases work" );
