Fix CI on linux

Don't use lldb-mi as the MIDebugger when we're in gdb mode (it's on the
PATH because llvm is installed)
This commit is contained in:
Ben Jackson 2020-03-21 17:01:15 +00:00
commit 5d404708cf
2 changed files with 11 additions and 10 deletions

View file

@ -63,7 +63,7 @@ stages:
env: env:
VIMSPECTOR_MIMODE: gdb VIMSPECTOR_MIMODE: gdb
VIMSPECTOR_TEST_STDOUT: true VIMSPECTOR_TEST_STDOUT: true
VIMSPECTOR_MI_DEBUGGER: "" VIMSPECTOR_MI_DEBUGGER: gdb
- bash: ./make_package linux $(Build.SourceVersion) - bash: ./make_package linux $(Build.SourceVersion)
displayName: 'Package' displayName: 'Package'

View file

@ -23,13 +23,6 @@ fi
if [ -z "$VIMSPECTOR_MIMODE" ]; then if [ -z "$VIMSPECTOR_MIMODE" ]; then
if which lldb >/dev/null 2>&1; then if which lldb >/dev/null 2>&1; then
export VIMSPECTOR_MIMODE=lldb export VIMSPECTOR_MIMODE=lldb
elif which gdb >/dev/null 2>&1; then
export VIMSPECTOR_MIMODE=gdb
else
echo "Couldn't guess VIMSPECTOR_MIMODE. Need lldb or gdb in path"
exit 1
fi
fi
if [ -z "${VIMSPECTOR_MI_DEBUGGER}" ]; then if [ -z "${VIMSPECTOR_MI_DEBUGGER}" ]; then
if which lldb-mi >/dev/null 2>&1; then if which lldb-mi >/dev/null 2>&1; then
@ -39,6 +32,14 @@ if [ -z "${VIMSPECTOR_MI_DEBUGGER}" ]; then
exit 1 exit 1
fi fi
fi fi
elif which gdb >/dev/null 2>&1; then
export VIMSPECTOR_MIMODE=gdb
export VIMSPECTOR_MI_DEBUGGER=gdb
else
echo "Couldn't guess VIMSPECTOR_MIMODE. Need lldb or gdb in path"
exit 1
fi
fi
echo "Testing with:" echo "Testing with:"
echo " * VIMSPECTOR_MIMODE=$VIMSPECTOR_MIMODE" echo " * VIMSPECTOR_MIMODE=$VIMSPECTOR_MIMODE"