Merge pull request #6913 from janvrany/pr/riscv-update-ci-job

RISC-V: update CI job
eclipse · Mar 14, 2023 · 6b9c970 · 6b9c970
2 parents fe76d07 + 191c35b
commit 6b9c970
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/buildenv/jenkins/omrbuild.groovy b/buildenv/jenkins/omrbuild.groovy
@@ -165,14 +165,14 @@ SPECS = [
  'label' : 'compile:riscv64:cross',
  'reference' : defaultReference,
  'environment' : [
- 'PATH+CCACHE_AND_QEMU=/usr/lib/ccache/:/home/jenkins/qemu/build'
+ 'PATH+CCACHE=/usr/lib/ccache/'
  ],
  'ccache' : true,
  'buildSystem' : 'cmake',
  'builds' : [
  [
  'buildDir' : cmakeBuildDir,
- 'configureArgs' : '-Wdev -C../cmake/caches/Travis.cmake -DOMR_DDR=OFF -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/riscv64-linux-cross.cmake "-DCMAKE_SYSROOT=${CROSS_SYSROOT_RISCV64}"',
+ 'configureArgs' : '-Wdev -C../cmake/caches/Travis.cmake -DOMR_DDR=OFF -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/riscv64-linux-cross.cmake "-DOMR_EXE_LAUNCHER=/home/jenkins/qemu/build/qemu-riscv64;-L;${CROSS_SYSROOT_RISCV64}" "-DCMAKE_SYSROOT=${CROSS_SYSROOT_RISCV64}"',
  'compile' : defaultCompile
  ]
  ],

diff --git a/fvtest/threadtest/CMakeLists.txt b/fvtest/threadtest/CMakeLists.txt
@@ -64,7 +64,9 @@ endif()
 set_property(TARGET omrthreadtest PROPERTY FOLDER fvtest)
 
 if(OMR_OS_LINUX AND OMR_ARCH_RISCV AND CMAKE_CROSSCOMPILING)
- set(EXCLUDE_LIST "${EXCLUDE_LIST}-PriorityInterrupt.*")
+ message(WARNING "Disabling PriorityInterrupt test (see #6665) ")
+ message(WARNING "Disabling RWMutex test (see #6706) ")
+ set(EXCLUDE_LIST "${EXCLUDE_LIST}-PriorityInterrupt.*:RWMutex*")
 endif()
 
 if(EXCLUDE_LIST)