[interp] enable a couple delegate tests on CI
authorBernhard Urban <bernhard.urban@xamarin.com>
Tue, 25 Apr 2017 22:13:38 +0000 (00:13 +0200)
committerBernhard Urban <bernhard.urban@xamarin.com>
Fri, 28 Apr 2017 18:52:06 +0000 (20:52 +0200)
mono/mini/interp/interp.c
mono/tests/Makefile.am

index c9f5c59d45c2cec441c449dce72a636c309dd681..0d8e765711d838e3fca3723f88d03d6203ed6c0a 100644 (file)
@@ -707,6 +707,9 @@ interp_walk_stack_with_ctx (MonoInternalStackWalk func, MonoContext *ctx, MonoUn
        MonoError error;
        ThreadContext *context = mono_native_tls_get_value (thread_context_id);
 
+       if (!context)
+               return;
+
        MonoInvocation *frame = context->current_frame;
 
        while (frame) {
@@ -4594,7 +4597,7 @@ array_constructed:
                        sp [-1].data.p = alloca (len);
                        MonoMethodHeader *header = mono_method_get_header_checked (frame->runtime_method->method, &error);
                        mono_error_cleanup (&error); /* FIXME: don't swallow the error */
-                       if (header->init_locals)
+                       if (header && header->init_locals)
                                memset (sp [-1].data.p, 0, len);
                        ++ip;
                        MINT_IN_BREAK;
index 275711ed37c8223845f6803bae9f1f61c1354f9d..f8946b03be7cbd909b4c31d8b448741bcf8a01b3 100644 (file)
@@ -1047,14 +1047,7 @@ INTERP_DISABLED_TESTS = \
        calliGenericTest.exe \
        cominterop.exe \
        cross-domain.exe \
-       delegate-async-exit.exe \
-       delegate-delegate-exit.exe \
-       delegate-exit.exe \
        delegate-with-null-target.exe \
-       delegate1.exe \
-       delegate3.exe \
-       delegate5.exe \
-       delegate8.exe \
        delegate9.exe \
        dynamic-method-stack-traces.exe \
        even-odd.exe \