From 70c41f75b548bb5df2918731f040a5e0b1303512 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 6 Mar 2017 17:50:39 -0700 Subject: [PATCH] test/vhost: override NRHUGE to avoid extra setup Rather than re-running setup.sh during the vhost tests, just pre-configure NRHUGE to the necessary value for all setup.sh invocations during autotest. Change-Id: I1a4d9a7f7ab52082a8f626c3c64807417a493b5f Signed-off-by: Daniel Verkamp --- scripts/autotest_common.sh | 3 +++ test/vhost/spdk_vhost.sh | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh index eedc038f7..8603c0494 100755 --- a/scripts/autotest_common.sh +++ b/scripts/autotest_common.sh @@ -7,6 +7,9 @@ MAKECONFIG='CONFIG_DEBUG=y CONFIG_WERROR=y' export UBSAN_OPTIONS='halt_on_error=1:print_stacktrace=1:abort_on_error=1' +# Override the default NRHUGE in scripts/setup.sh +export NRHUGE=4096 + case `uname` in FreeBSD) DPDK_DIR=/usr/local/share/dpdk/x86_64-native-bsdapp-clang diff --git a/test/vhost/spdk_vhost.sh b/test/vhost/spdk_vhost.sh index c685e9fbc..1f45e6295 100755 --- a/test/vhost/spdk_vhost.sh +++ b/test/vhost/spdk_vhost.sh @@ -14,7 +14,6 @@ param="$1" if [ $(uname -s) = Linux ]; then -NRHUGE=4096 ./../../scripts/setup.sh echo Running SPDK vhost fio autotest... case $param in