Rewrite broken parts of test discovery and identification

There's no way this would have worked properly; I don't know what I was
thinking of.

src/libexec/jattool-runtest

@@ -75,7 +75,10 @@ main() {
             ;;
         */*)
             TestHome=$1
-            TestId=$(jattool tfind) || die "could not locate test: $TestId"
+            TestId=$(jattool tfind -f jats "$TestHome") || {
+                warn "could not find test id, using pathname: $TestHome"
+                TestId="jats://_jats_no_suite_/$TestHome"
+            }
             ;;
     esac
     test -f "$TestHome/test" \

src/libexec/jattool-tfind

@@ -17,27 +17,39 @@ discover() {
     #
     # Find tests under dirs ${FindDirs[@]}
     #
-    local SuiteDir  # suite root dir
-    local TRPath    # relative path to test directory within $SuiteDir
-    local SuiteId   # suite's jats: id
-    jattool sfind -f path "${FindDirs[@]}" \
-      | while read -r SuiteDir; do
-            SuiteId=$(jattool sfind "$SuiteDir")
-            debug -v SuiteDir SuiteId
-            pushd "$SuiteDir">/dev/null
-                find . -type f -name test -printf '%P\n' \
-                  | sed 's:/test::' \
-                  | while read -r TRPath; do
-                        case $Fmt in
-                            path) echo "$SuiteDir/$TRPath" ;;
-                            jats) echo "$SuiteId/$TRPath" ;;
-                        esac
-                        debug -v TRPath
-                    done
-            popd >/dev/null
+    local s_dir  # suite root dir
+    local t_cand     # possible test path
+    local t_apath    # absolute path to test directory
+    local t_rpath    # relative path to test directory within $s_dir
+    local s_id   # suite's jats: id
+    find "${FindDirs[@]}" -name test \
+      | while read -r t_cand; do
+            s_dir=$(straverse "$t_cand") || continue
+            t_apath=$(dirname "$(readlink -f "$t_cand")")
+            t_rpath=${t_apath#$s_dir/}
+            s_id=$(jattool sfind -f jats "$s_dir")
+            debug -v s_dir s_id t_apath t_rpath
+            case $Fmt in
+                path) echo "$s_dir/$t_rpath" ;;
+                jats) echo "$s_id/$t_rpath" ;;
+            esac
         done
 }
 
+straverse() {
+    #
+    # Traverse back from test dir $1 and print its suite dir
+    #
+    local tdir=$1
+    local dir
+    dir=$(readlink -f "$tdir")
+    while true; do
+        test -d "$dir/.jats" && echo "$dir" && return 0
+        test "$dir" == "/" && return 1
+        dir=${dir%/*}; test -n "$dir" || dir=/
+    done
+}
+
 main() {
     local FindDirs=()
     local Fmt=path
@@ -52,7 +64,7 @@ main() {
         *) usage -w "unknown FMT: $Fmt" ;;
     esac
     debug -v FindDirs Fmt
-    discover
+    discover | grep .
 }
 
 main "$@"