From 38bfc41702ec27e5adcf70668217e566de7e1870 Mon Sep 17 00:00:00 2001 From: zhangyukun8 Date: Wed, 29 Dec 2021 08:42:43 +0000 Subject: [PATCH 1/2] Enable thread check Signed-off-by: zhangyukun --- ecmascript/base/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecmascript/base/config.h b/ecmascript/base/config.h index a269f31428..d24e295f4e 100644 --- a/ecmascript/base/config.h +++ b/ecmascript/base/config.h @@ -51,7 +51,7 @@ namespace panda::ecmascript { #define ECMASCRIPT_SWITCH_GC_MODE_TO_COMPRESS_GC 0 #define ECMASCRIPT_ENABLE_CAST_CHECK 0 #define ECMASCRIPT_ENABLE_HEAP_VERIFY 0 - #define ECMASCRIPT_ENABLE_THREAD_CHECK 0 + #define ECMASCRIPT_ENABLE_THREAD_CHECK 1 #define ECMASCRIPT_ENABLE_ACTIVE_CPUPROFILER 0 #endif } // namespace panda::ecmascript -- Gitee From bb90fa7ff425ec65b4413334ddb0c9ef5b6885b1 Mon Sep 17 00:00:00 2001 From: zhangyukun8 Date: Wed, 29 Dec 2021 10:36:19 +0000 Subject: [PATCH 2/2] Use macro to control the thread_check testcase Signed-off-by: zhangyukun --- ecmascript/napi/test/jsnapi_tests.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ecmascript/napi/test/jsnapi_tests.cpp b/ecmascript/napi/test/jsnapi_tests.cpp index 8bdbcd5a93..920c5f7ebb 100644 --- a/ecmascript/napi/test/jsnapi_tests.cpp +++ b/ecmascript/napi/test/jsnapi_tests.cpp @@ -84,8 +84,10 @@ HWTEST_F_L0(JSNApiTests, GetGlobalObject) HWTEST_F_L0(JSNApiTests, ThreadIdCheck) { EXPECT_TRUE(vm_->GetJSThread()->GetThreadId() == JSThread::GetCurrentThreadId()); +#if defined(ECMASCRIPT_ENABLE_THREAD_CHECK) && !ECMASCRIPT_ENABLE_THREAD_CHECK std::thread testThread(ThreadCheck, vm_); testThread.join(); +#endif } HWTEST_F_L0(JSNApiTests, RegisterFunction) -- Gitee