Fix ltlcounter.test for VPATH builds and n > 2.

* src/tgbatest/defs.in (srcdir): Adjust from VPATH builds.
* src/tgbatest/ltlcounter.test (lcdir): Adjust definition to
new value of $srcdir.
(run): Fix setting of $run after $n = 2.  Using run=: would in
fact disable all the big tests...

src/tgbatest/defs.in

@@ -49,6 +49,15 @@ rm -rf $testSubDir > /dev/null 2>&1
 mkdir $testSubDir
 cd $testSubDir
 
+# Adjust srcdir now that we are in a subdirectory.  We still want to
+# source directory corresponding to the build directory that contains
+# $testSubDir.
+case $srcdir in
+  # I
+  [\\/$]* | ?:[\\/]* );;
+  *) srcdir=../$srcdir
+esac
+
 DOT='@DOT@'
 top_builddir='../@top_builddir@'
 LBTT="@LBTT@"

src/tgbatest/ltlcounter.test

@@ -25,7 +25,7 @@
 
 set -e
 
-lcdir=$srcdir/../ltlcounter
+lcdir=$srcdir/ltlcounter
 lc=$lcdir/LTLcounter.pl
 lcl=$lcdir/LTLcounterLinear.pl
 lcc=$lcdir/LTLcounterCarry.pl
@@ -50,21 +50,21 @@ check_formula()
 # so the translation of the formula stopped midway, on a formula it
 # thought it had already seen.
 
-for i in 1 2 3 4 5 6 7 8 9 10 11 12
+for n in 1 2 3 4 5 6 7 8 9 10 11 12
 do
-  :;:;: "========== $i counters ==========" ;:;:  # only visible with "set -x"
-  f=`"$lc" $i`
+  :;:;: "========== $n counters ==========" ;:;:  # only visible with "set -x"
+  f=`"$lc" $n`
   check_formula "$f"
-  f=`"$lcl" $i`
+  f=`"$lcl" $n`
   check_formula "$f"
-  f=`"$lcc" $i`
+  f=`"$lcc" $n`
   check_formula "$f"
-  f=`"$lccl" $i`
+  f=`"$lccl" $n`
   check_formula "$f"
-  
-  # Only run the first two formulae under valgrind, 
+
+  # Only run the first two formulae under valgrind,
   # it is too slow otherwise.
-  if test $i = 2; then
-     run=:
+  if test $n = 2; then
+     run=
   fi
 done