88055b422f
We do not need to force usage of 4096MB of memory for these
tests. Let's just remove how that is being forced.
This allows us to also remove the setup.sh call from
the spdkcli test common.sh script. Its only purpose
was to increase the amount of memory allocated to satisfy
the spdkcli tests, but now that the spdkcli tests aren't
forcing so much memory to be allocated, we can remove
that too.
Fixes issue #2694.
Note: these limits were in the original commit for the
test scripts - 7e8206c - but it is not clear why they
were added instead of just relying on DPDK dynamic
memory allocation..
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I2210765e69117205a039aa6bc468efa5d5d537cb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14520
Reviewed-by: Michal Berger <michal.berger@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
46 lines
1.1 KiB
Bash
46 lines
1.1 KiB
Bash
spdkcli_job="$rootdir/test/spdkcli/spdkcli_job.py"
|
|
spdk_clear_config_py="$rootdir/test/json_config/clear_config.py"
|
|
|
|
function on_error_exit() {
|
|
set +e
|
|
if [ -n "$spdk_tgt_pid" ]; then
|
|
killprocess $spdk_tgt_pid
|
|
fi
|
|
if [ -n "$nvmf_tgt_pid" ]; then
|
|
killprocess $nvmf_tgt_pid
|
|
fi
|
|
if [ -n "$iscsi_tgt_pid" ]; then
|
|
killprocess $iscsi_tgt_pid
|
|
fi
|
|
if [ -n "$vhost_tgt_pid" ]; then
|
|
killprocess $vhost_tgt_pid
|
|
fi
|
|
rm -f $testdir/${MATCH_FILE} $testdir/match_files/spdkcli_details_vhost.test /tmp/sample_aio /tmp/sample_pmem
|
|
print_backtrace
|
|
exit 1
|
|
}
|
|
|
|
function run_spdk_tgt() {
|
|
$SPDK_BIN_DIR/spdk_tgt -m 0x3 -p 0 &
|
|
spdk_tgt_pid=$!
|
|
waitforlisten $spdk_tgt_pid
|
|
}
|
|
|
|
function run_nvmf_tgt() {
|
|
$SPDK_BIN_DIR/nvmf_tgt -m 0x3 -p 0 &
|
|
nvmf_tgt_pid=$!
|
|
waitforlisten $nvmf_tgt_pid
|
|
}
|
|
|
|
function run_vhost_tgt() {
|
|
$SPDK_BIN_DIR/vhost -m 0x3 -p 0 &
|
|
vhost_tgt_pid=$!
|
|
waitforlisten $vhost_tgt_pid
|
|
}
|
|
|
|
function check_match() {
|
|
$rootdir/scripts/spdkcli.py ll $SPDKCLI_BRANCH > $testdir/match_files/${MATCH_FILE}
|
|
$rootdir/test/app/match/match $testdir/match_files/${MATCH_FILE}.match
|
|
rm -f $testdir/match_files/${MATCH_FILE}
|
|
}
|