From cfa474b82a55eca5ba3905c27d9ebbe99fcfb823 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 21 Mar 2019 11:23:30 -0700
Subject: [PATCH] test script: Find test binary correctly when `-g` is passed

---
 script/test | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/script/test b/script/test
index 1ec50e30..5fda7cb2 100755
--- a/script/test
+++ b/script/test
@@ -67,7 +67,7 @@ while getopts "dDghl:e:s:t:" option; do
   esac
 done
 
-shift $(expr $OPTIND - 1 )
+shift $(expr $OPTIND - 1)
 
 if [[ -n $TREE_SITTER_TEST_LANGUAGE_FILTER || -n $TREE_SITTER_TEST_EXAMPLE_FILTER || -n $TREE_SITTER_TEST_TRIAL_FILTER ]]; then
   top_level_filter=corpus
@@ -76,7 +76,10 @@ else
 fi
 
 if [[ "${mode}" == "debug" ]]; then
-  test_binary=$(cargo test --no-run --message-format=json 2> /dev/null | jq -rs '.[-1].filenames[0]')
+  test_binary=$(
+    cargo test -p tree-sitter-cli --no-run --message-format=json 2> /dev/null |\
+    jq -rs 'map(select(.target.name == "tree-sitter-cli" and .executable))[0].executable'
+  )
   lldb "${test_binary}" -- $top_level_filter
 else
   cargo test -p tree-sitter-cli --jobs 1 $top_level_filter -- --nocapture