Skip to content

Commit f272b27

Browse files
authored
Merge pull request #93 from tasleson/enable_lsm_testing
Re-enable lsm testing
2 parents ec79107 + 2d0c0ae commit f272b27

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

test/lsm_test.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ if [ $FEDORA -eq 0 ]; then
2828

2929
./autogen.sh || exit 1
3030

31-
# Not all the libraries for py3 exist
32-
./configure --with-python2 || exit 1
31+
./configure --without-smispy || exit 1
3332

3433
V=1 make || exit 1
3534

3635
# Setup some symlinks
36+
# We don't have pywbem available, remove plugin so we don't fail when we test for available plugins
37+
# Note: we should likely just leverage the make install to custom location to avoid all this.
38+
rm -rf `pwd`/plugin/smispy_plugin || exit 1
3739
ln -s `pwd`/plugin `pwd`/python_binding/lsm/plugin || exit 1
3840
ln -s `pwd`/tools/lsmcli `pwd`/python_binding/lsm || exit 1
3941
ln -s `pwd`/python_binding/lsm/.libs/*.so `pwd`/python_binding/lsm/. || exit 1

test/test.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ fi
150150

151151
# get/build/run or install libstoragemgmt tests
152152
# Need to update lsm for latest ubuntu
153-
# ./test/lsm_test.sh
154-
155-
echo "skipping libStorageMgmt testing ..."
153+
./test/lsm_test.sh
156154

157155
rc=$?
158156
if [ $rc -ne 0 ]; then

0 commit comments

Comments
 (0)