diff options
| author | Liu Yiding <yidingx.liu@intel.com> | 2019-07-23 17:05:53 +0800 |
|---|---|---|
| committer | Philip Li <philip.li@intel.com> | 2019-07-23 19:16:07 +0800 |
| commit | f68b9771d6f57ca02aae6466a734a1d4ade79a03 (patch) | |
| tree | dc93d0a14bc4b9b5e70482467c893f8b101ae5c2 | |
| parent | 96bc945691bef2492a4e47efa9fd353a2f06e53b (diff) | |
| download | lkp-tests-f68b9771d6f57ca02aae6466a734a1d4ade79a03.tar.gz | |
pack/nvml: enable pack for clearlinux
clearlinux has provided the necessary build-deps for nvml.
so at most of case, we don't need to install them from source
on cluster, pack passed.
------
/result/pack/nvml/lkp-opteron1/clear-ota-25590-x86_64-2018-10-18.cgz/x86_64-rhel-7.2-clear/gcc-7/5f9e832c137075045d15cd6899ab0505cfb2ca4b/8 PASS
------
on local host, lkp install/run works.
------
root@clear-lkp-30040/lkp/result/nvml/arch-none/clear-lkp/clear-linux-os/x86_64-rhel-7.6/gcc-7/5.1.12-357.kvm/9 # cat nvml.json
{
"nvml.arch_flags_TEST0_none_debug.pass": [
1
],
"nvml.arch_flags_TEST0_none_nondebug.pass": [
1
],
"nvml.arch_flags_TEST0_none_static-debug.pass": [
1
],
"nvml.arch_flags_TEST0_none_static-nondebug.pass": [
1
]
}
------
Signed-off-by: Liu Yiding <yidingx.liu@intel.com>
Signed-off-by: Philip Li <philip.li@intel.com>
| -rwxr-xr-x | pack/nvml | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -1,7 +1,14 @@ #!/bin/bash +. $LKP_SRC/lib/tests/nvml.sh + download() { + [ "$distro" = "clear" ] && { + git_clone_update https://github.com/pmem/nvml.git || return + return 0 + } + git_clone_update https://github.com/pmem/valgrind.git --branch pmem-3.12 || return git_clone_update https://github.com/llvm-mirror/llvm.git --branch release_39 --depth 1 || return git_clone_update https://github.com/llvm-mirror/libcxxabi.git --branch release_39 --depth 1 || return @@ -96,6 +103,8 @@ build() { [ "$distro" = "centos" ] && sed -i 's/CXXFLAGS += -Wno-unknown-attributes/CXXFLAGS += -Wno-ignored-attributes/' ./src/benchmarks/Makefile + [ "$distro" = "clear" ] && return + build_install_valgrind_pmem || return build_install_libcxx || return build_install_libfabric || return @@ -109,14 +118,17 @@ install() pack() { + mkdir -p $BUILD_DIR/valgrind_install cd $BUILD_DIR/valgrind_install || return { echo /lkp echo /lkp/benchmarks find /lkp/benchmarks/$BM_NAME - find ./usr | sed 's/^.//' - echo /usr/local/libcxx - find /usr/local/libcxx + is_clearlinux || { + find ./usr | sed 's/^.//' + echo /usr/local/libcxx + find /usr/local/libcxx + } } | cpio --quiet -o -H newc | gzip -n -9 > /lkp/benchmarks/${BM_NAME}.cgz [[ $arch ]] && mv "/lkp/benchmarks/${BM_NAME}.cgz" "/lkp/benchmarks/${BM_NAME}-${arch}.cgz" |