diff options
| author | 2023-01-17 13:13:55 +0000 | |
|---|---|---|
| committer | 2023-05-02 15:16:13 +0000 | |
| commit | 01e6b56f6a5290a01c00ce1f0d3579a41a27b2e5 (patch) | |
| tree | c02a2b59e9dd64ca826a81a8dfda6ca647ade27c /compiler/jni/jni_compiler_test.cc | |
| parent | 581b6c658386208c68aa33259fa2b0d41546d219 (diff) | |
riscv64: disable gtests for unsupported components.
Bug: b/271573990
Test: gtests on host:
lunch aosp_riscv64-userdebug && m test-art-host-gtest
Test: gtests on target (on a Linux RISC-V VM):
lunch aosp_riscv64-userdebug
export ART_TEST_SSH_USER=ubuntu
export ART_TEST_SSH_HOST=localhost
export ART_TEST_SSH_PORT=10001
export ART_TEST_ON_VM=true
. art/tools/buildbot-utils.sh
art/tools/buildbot-build.sh --target
# Create, boot and configure the VM.
art/tools/buildbot-vm.sh create
art/tools/buildbot-vm.sh boot
art/tools/buildbot-vm.sh setup-ssh # password: 'ubuntu'
art/tools/buildbot-cleanup-device.sh
art/tools/buildbot-setup-device.sh
art/tools/buildbot-sync.sh
art/tools/run-gtests.sh
Change-Id: I278e3453406a91a5e9d03645cafb9a9d1f82d896
Diffstat (limited to 'compiler/jni/jni_compiler_test.cc')
| -rw-r--r-- | compiler/jni/jni_compiler_test.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index 397db251b8..2fd7a6b535 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -447,12 +447,14 @@ LockWord JniCompilerTest::GetLockWord(jobject obj) { // 1) synchronized keyword # define JNI_TEST_NORMAL_ONLY(TestName) \ TEST_F(JniCompilerTest, TestName ## NormalCompiler) { \ + TEST_DISABLED_FOR_RISCV64(); \ ScopedCheckHandleScope top_handle_scope_check; \ SCOPED_TRACE("Normal JNI with compiler"); \ gCurrentJni = static_cast<uint32_t>(JniKind::kNormal); \ TestName ## Impl(); \ } \ TEST_F(JniCompilerTest, TestName ## NormalGeneric) { \ + TEST_DISABLED_FOR_RISCV64(); \ ScopedCheckHandleScope top_handle_scope_check; \ SCOPED_TRACE("Normal JNI with generic"); \ gCurrentJni = static_cast<uint32_t>(JniKind::kNormal); \ @@ -464,6 +466,7 @@ LockWord JniCompilerTest::GetLockWord(jobject obj) { #define JNI_TEST(TestName) \ JNI_TEST_NORMAL_ONLY(TestName) \ TEST_F(JniCompilerTest, TestName ## FastCompiler) { \ + TEST_DISABLED_FOR_RISCV64(); \ ScopedCheckHandleScope top_handle_scope_check; \ SCOPED_TRACE("@FastNative JNI with compiler"); \ gCurrentJni = static_cast<uint32_t>(JniKind::kFast); \ @@ -471,6 +474,7 @@ LockWord JniCompilerTest::GetLockWord(jobject obj) { } \ \ TEST_F(JniCompilerTest, TestName ## FastGeneric) { \ + TEST_DISABLED_FOR_RISCV64(); \ ScopedCheckHandleScope top_handle_scope_check; \ SCOPED_TRACE("@FastNative JNI with generic"); \ gCurrentJni = static_cast<uint32_t>(JniKind::kFast); \ @@ -481,12 +485,14 @@ LockWord JniCompilerTest::GetLockWord(jobject obj) { // Test (@CriticalNative) x (compiler, generic) only. #define JNI_TEST_CRITICAL_ONLY(TestName) \ TEST_F(JniCompilerTest, TestName ## CriticalCompiler) { \ + TEST_DISABLED_FOR_RISCV64(); \ ScopedCheckHandleScope top_handle_scope_check; \ SCOPED_TRACE("@CriticalNative JNI with compiler"); \ gCurrentJni = static_cast<uint32_t>(JniKind::kCritical); \ TestName ## Impl(); \ } \ TEST_F(JniCompilerTest, TestName ## CriticalGeneric) { \ + TEST_DISABLED_FOR_RISCV64(); \ ScopedCheckHandleScope top_handle_scope_check; \ SCOPED_TRACE("@CriticalNative JNI with generic"); \ gCurrentJni = static_cast<uint32_t>(JniKind::kCritical); \ |