ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/check_so_deps: pass the conffile to this test.

Browse Source 
Apparently the environment wasn't getting passed to this test so
the configuration wasn't being preserved.

Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: I65126e94c82d92fe33e81d2d0a6ef578aa506a34
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2251
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2020-05-07 14:38:50 -07:00 committed by Tomasz Zawadzki
parent 4edb1e0370
commit 46b614d174
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.sh
View File

@ -155,7 +155,7 @@ function autobuild_test_suite() {
if [ "$SPDK_TEST_OCF" -eq 1 ]; then
run_test "autobuild_ocf_precompile" ocf_precompile
fi
run_test "autobuild_check_so_deps" $rootdir/test/make/check_so_deps.sh
run_test "autobuild_check_so_deps" $rootdir/test/make/check_so_deps.sh $1
run_test "scanbuild_make" scanbuild_make
run_test "autobuild_generated_files_check" porcelain_check
run_test "autobuild_header_dependency_check" header_dependency_check
@ -177,7 +177,7 @@ if [ $SPDK_RUN_UBSAN -eq 1 ]; then
fi
if [ "$SPDK_TEST_AUTOBUILD" -eq 1 ]; then
run_test "autobuild" autobuild_test_suite
run_test "autobuild" autobuild_test_suite $1
else
if [ "$SPDK_TEST_OCF" -eq 1 ]; then
run_test "autobuild_ocf_precompile" ocf_precompile

8
test/make/check_so_deps.sh
View File

@ -6,6 +6,13 @@ if [ "$(uname -s)" = "FreeBSD" ]; then
fi
rootdir=$(readlink -f $(dirname $0)/../..)
if [[ ! -f $1 ]]; then
echo "ERROR: SPDK test configuration not specified"
exit 1
fi
source $1
source "$rootdir/test/common/autotest_common.sh"
libdir="$rootdir/build/lib"
@ -178,6 +185,7 @@ function confirm_deps() {
# symbol dependencies we have.
sed -i -e 's,include $(SPDK_ROOT_DIR)/mk/spdk.lib_deps.mk,,g' "$rootdir/mk/spdk.lib.mk"
source ~/autorun-spdk.conf
config_params=$(get_config_params)
if [ "$SPDK_TEST_OCF" -eq 1 ]; then
config_params="$config_params --with-ocf=$rootdir/build/ocf.a"