Changeset 4353 for toiletTweet

Timestamp:

Feb 9, 2010, 1:50:15 AM (10 years ago)

Author:

Sam Hocevar

Message:

Improve testsuite.

Location:

toilet/trunk/test

Files:

• Makefile.am (modified) (1 diff)
• check-build (deleted)
• check-fonts (modified) (1 diff)
• check-source (added)

toilet/trunk/test/Makefile.am

@@ -1 +1 @@
 
-EXTRA_DIST = check-build check-fonts
+EXTRA_DIST = check-source check-fonts
 
-TESTS = check-build check-fonts
+TESTS = check-source check-fonts
 

toilet/trunk/test/check-fonts

@@ -6 +6 @@
 # Check that we have no tabs or trailing spaces in the source code
 #
-failure=0
-(cd ../fonts
-  for x in $(make -s echo-fonts); do
-    case "$x" in
-     *.tlf|*.flf) ;;
-     *) continue ;;
-    esac
-    echo "Checking font $x..."
-    if ../src/toilet -d ../fonts -f "$x" Hello World >/dev/null; then
-      :
-    else
-      echo "Error loading font $x"
-      failure=1
-    fi
-  done)
-if test "$failure" != "0"; then
-  ret=1
-else
-  echo "0 errors in fonts"
-fi
+nfails=0
+nfonts=0
+for x in $(make -s echo-fonts -C ../fonts); do
+  case "$x" in
+   *.tlf|*.flf) ;;
+   *) continue ;;
+  esac
+  nfonts=$(($nfonts + 1))
+  if ../src/toilet -d ../fonts -f "$x" Hello World >/dev/null; then
+    :
+  else
+    echo "Error loading font $x"
+    nfails=$(($nfails + 1))
+  fi
+done
 
-if test "$ret" != "0"; then
+echo "$nfonts fonts, $nfails load errors"
+
+if test "$nfails" != "0"; then
   exit 1
 fi