X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=bin%2Fdiagnose-test;h=52d7c4c9b07ff188aebf85fcb0a0283f42f4d239;hb=bc4ccb4263ccbcc915d913c7111fdd40e2e998fe;hp=7744fe0bd628c836bc4f1085fe3aa5c966fb58dd;hpb=1ae8c7a0199a4955708c7f5d7a286a12782b5fd2;p=clnl

diff --git a/bin/diagnose-test b/bin/diagnose-test
index 7744fe0..52d7c4c 100755
--- a/bin/diagnose-test
+++ b/bin/diagnose-test
@@ -4,16 +4,29 @@ if ! [ -n "$1" ] ; then
   echo "Uhm, need a test name, yo"
   exit 1
 fi
-TEST=$1
+TEST=$@
 
-sbcl --eval "(asdf:load-system :cl-nl-test)" --eval "(quit)" &> /dev/null
-COMMANDS=$(sbcl --noinform --disable-ldb --lose-on-corruption --end-runtime-options --eval "(asdf:load-system :cl-nl-test)" --eval "(cl-nl-test::test-commands \"$1\")" --eval "(quit)" 2> /dev/null | sed -n '/^----$/,$p' | tail -n +2)
+sbcl --eval "(asdf:load-system :clnl-test)" --eval "(quit)" &> /dev/null
 
-scalafile=$(mktemp -u -p .)
-clfile=$(mktemp -u -p .)
+runtestfn() {
+  sbcl --noinform --disable-ldb --lose-on-corruption --end-runtime-options \
+    --eval "(asdf:load-system :clnl-test)" \
+    --eval "(clnl-test::$1 \"$TEST\")" \
+    --eval "(quit)" 2> /dev/null | sed -n '/^----$/,$p' | tail -n +2
+}
 
-echo "$COMMANDS" | bin/runcmd.scala | sed -n '/^----$/,$p' | tail -n +2 > $scalafile
-sbcl --noinform --disable-ldb --lose-on-corruption --end-runtime-options --eval "(asdf:load-system :cl-nl-test)" --eval "(cl-nl-test::diagnose-test \"$1\")" --eval "(quit)" 2> /dev/null | sed -n '/^----$/,$p' | tail -n +2 > $clfile
+scalaprog=$(runtestfn "test-scala-prog")
+
+if [ -z $scalaprog ] ; then
+  echo "Scala prog empty, so use view diagnosis rather than this one"
+  exit 1
+fi
+
+scalafile=$(mktemp -u -p . --suffix .scala.dat)
+clfile=$(mktemp -u -p . --suffix .cl.dat)
+
+runtestfn "test-scala-input" | $scalaprog | sed -n '/^----$/,$p' | tail -n +2 > $scalafile
+runtestfn "test-debug" >$clfile
 
 vimdiff $scalafile $clfile