From 8ddeccad58d7f901daea23ad58dc1a4978a33343 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 15 May 2020 10:25:52 +0200 Subject: [PATCH] vm_setup: Use pre-defined cmdline when compiling ref spdk on FreeBSD The selected options are based on how CI runs the make test. Change-Id: I71d7bc13250f0f4b5212eff4d13794979bcd4b6d Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2454 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/common/config/vm_setup.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 6683aea3c..83a8c26cb 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -75,11 +75,21 @@ EOF source $HOME/autorun-spdk.conf source $output_dir/test/common/autotest_common.sh - config_params="$(get_config_params)" + # Prepare separate, fixed, cmdline for the FreeBSD, Issue #1397. + if [[ $OSID == freebsd ]]; then + config_params="--enable-debug --enable-werror" + config_params+=" --with-idxd --with-fio=/usr/src/fio" + config_params+=" --disable-unit-tests --without-isal" + MAKE=gmake + else + config_params="$(get_config_params)" + fi $output_dir/configure $(echo $config_params | sed 's/--enable-coverage//g') - $MAKE -C $output_dir $MAKEFLAGS include/spdk/config.h - CONFIG_OCF_PATH="$output_dir/ocf" $MAKE -C $output_dir/lib/env_ocf $MAKEFLAGS exportlib O=$output_dir/build/ocf.a - $output_dir/configure $config_params --with-ocf=$output_dir/build/ocf.a --with-shared + if [[ $OSID != freebsd ]]; then + $MAKE -C $output_dir $MAKEFLAGS include/spdk/config.h + CONFIG_OCF_PATH="$output_dir/ocf" $MAKE -C $output_dir/lib/env_ocf $MAKEFLAGS exportlib O=$output_dir/build/ocf.a + $output_dir/configure $config_params --with-ocf=$output_dir/build/ocf.a --with-shared + fi $MAKE -C $output_dir $MAKEFLAGS fi }