diff options
| author | Jere Leppänen <jere.leppanen@nokia.com> | 2022-09-20 19:51:35 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2022-10-19 13:29:08 +0300 |
| commit | a6bc1ba6e512e94379a38b75251edcc03c550415 (patch) | |
| tree | d34fe36bb85c4b21c7d0a64af333cc7c962f9738 /scripts | |
| parent | cec90123c024c14dfd2fb555d9b23cc447d0d207 (diff) | |
ci: do installcheck in build jobs
Now that we have a build-and-run test in installcheck, use it in CI
build scripts, instead of implementing a similar test in each
individual script.
Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
Reviewed-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci/build.sh | 8 | ||||
| -rwxr-xr-x | scripts/ci/build_riscv64.sh | 4 | ||||
| -rwxr-xr-x | scripts/ci/build_static_x86_64.sh | 9 |
3 files changed, 3 insertions, 18 deletions
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index db8702b78..4a92cfd83 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -15,10 +15,4 @@ make -j $(nproc) make install -pushd ${HOME} -${CC} ${CFLAGS} ${OLDPWD}/example/sysinfo/odp_sysinfo.c -o odp_sysinfo_inst_dynamic `PKG_CONFIG_PATH=/opt/odp/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux` -if [ -z "$TARGET_ARCH" ] || [ "$TARGET_ARCH" == "$BUILD_ARCH" ] -then - LD_LIBRARY_PATH="/opt/odp/lib:$LD_LIBRARY_PATH" ./odp_sysinfo_inst_dynamic -fi -popd +make installcheck diff --git a/scripts/ci/build_riscv64.sh b/scripts/ci/build_riscv64.sh index bf6fdf941..c395aac82 100755 --- a/scripts/ci/build_riscv64.sh +++ b/scripts/ci/build_riscv64.sh @@ -27,6 +27,4 @@ make -j $(nproc) make install -pushd ${HOME} -${CC} ${CFLAGS} ${OLDPWD}/example/sysinfo/odp_sysinfo.c -o odp_sysinfo_inst_dynamic `PKG_CONFIG_PATH=/opt/odp/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux` -popd +make installcheck diff --git a/scripts/ci/build_static_x86_64.sh b/scripts/ci/build_static_x86_64.sh index 7b2712ed3..24d8a2d6a 100755 --- a/scripts/ci/build_static_x86_64.sh +++ b/scripts/ci/build_static_x86_64.sh @@ -14,11 +14,4 @@ make -j $(nproc) make install -# Build and run sysinfo with installed libs -pushd ${HOME} - -${CC} ${CFLAGS} ${OLDPWD}/example/sysinfo/odp_sysinfo.c -static -o odp_sysinfo_inst_static `PKG_CONFIG_PATH=/opt/odp/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs --static libodp-linux` - -./odp_sysinfo_inst_static - -popd +make installcheck |