diff --git a/configure b/configure index 4aa86608c..e2c0448d1 100755 --- a/configure +++ b/configure @@ -574,19 +574,13 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then exit 1 fi - if [[ "${CONFIG[RBD]}" = "y" ]]; then - echo "ISAL and RBD cannot co-exist currently so disabling ISAL and compression." - CONFIG[ISAL]=n - CONFIG[REDUCE]=n - else - cd $rootdir/isa-l - ISAL_LOG=$rootdir/isa-l/spdk-isal.log - echo -n "Configuring ISA-L (logfile: $ISAL_LOG)..." - ./autogen.sh &> $ISAL_LOG - ./configure CFLAGS="-fPIC -g -O2" --enable-shared=no >> $ISAL_LOG 2>&1 - echo "done." - cd $rootdir - fi + cd $rootdir/isa-l + ISAL_LOG=$rootdir/isa-l/spdk-isal.log + echo -n "Configuring ISA-L (logfile: $ISAL_LOG)..." + ./autogen.sh &> $ISAL_LOG + ./configure CFLAGS="-fPIC -g -O2" --enable-shared=no >> $ISAL_LOG 2>&1 + echo "done." + cd $rootdir fi if [[ "${CONFIG[PMDK]}" = "y" ]]; then diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 6a992158b..95666fc5f 100644 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -207,11 +207,7 @@ if [ -f /usr/include/libpmem.h ] && [ $SPDK_TEST_REDUCE -eq 1 ]; then fi if [ -d /usr/include/rbd ] && [ -d /usr/include/rados ] && [ $SPDK_TEST_RBD -eq 1 ]; then - if [ $SPDK_TEST_ISAL -eq 0 ]; then - config_params+=' --with-rbd' - else - echo "rbd not enabled because isal is enabled." - fi + config_params+=' --with-rbd' fi if [ $SPDK_TEST_VPP -eq 1 ]; then