*opts.tests: make sure we use --no-highlight

sync make-chekc-filter.rb with that used in bashdb Bump version to dev.
rocky · Dec 13, 2014 · 2e3ee28 · 2e3ee28
1 parent 975015e
commit 2e3ee28
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-12  rocky <rocky@gnu.org>
+
+	* ChangeLog, NEWS: Wrong date in NEWS. Release 0.9
+
 2014-12-12  rocky <rocky@gnu.org>
 
 	* ChangeLog, Makefile.am, make-check-filter.rb,

diff --git a/Makefile.am b/Makefile.am
@@ -72,6 +72,7 @@ if MAINTAINER_MODE
 rmChangeLog:
 	rm ChangeLog || true
 
+#: Create ChangeLog from version control
 ChangeLog: rmChangeLog
 	git log --pretty --numstat --summary | $(GIT2CL) > $@
 

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 dnl Configure script for Shell debugger
 define(DEBUGGER, zshdb)
 define(POSIXSHELL, zsh)
-AC_INIT([zshdb],[0.09],[rocky@gnu.org])
+AC_INIT([zshdb],[0.1dev],[rocky@gnu.org])
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE([no-define])
 

diff --git a/make-check-filter.rb b/make-check-filter.rb
@@ -9,9 +9,12 @@
         '\(cd \.\.',
         "make -C",
         "Test-Unit",
-        "config.status",
-        "`flet'",
+        "^config.status",
+        '^shunit2: ',
+        '^##<<+$',
+        '^##>>+$',
         '\s*$',
+        '`.+\' is up to date.$',
         '##[<>]+$'
        ].join('|') + ')'
 # puts pats

diff --git a/test/integration/lopts.tests b/test/integration/lopts.tests
@@ -1,6 +1,5 @@
 #!/bin/zsh
 # -*- shell-script -*-
-#$Id: lopts.tests,v 1.7 2008/08/19 22:10:45 rockyb Exp $
 
 [ -z "$srcdir" ] && srcdir=$PWD
 [ -z "$builddir" ] && builddir=$PWD
@@ -11,10 +10,10 @@ quitcmd="${top_srcdir}/test/data/quit.cmd"
 contcmd="${top_srcdir}/test/data/quit.cmd"
 debugged_script="${top_srcdir}/test/example/dbg-test1.sh"
 
-$SH ${top_builddir}/zshdb --no-init --help -q -L $top_builddir
-$SH ${top_builddir}/zshdb --no-init --quiet -B --library $top_builddir \
+$SH ${top_builddir}/zshdb --no-init --no-highlight --help -q -L $top_builddir
+$SH ${top_builddir}/zshdb --no-init --no-highlight --quiet -B --library $top_builddir \
   -x $quitcmd $debugged_script
-$SH ${top_builddir}/zshdb --no-init --basename --quiet --library $top_builddir \
+$SH ${top_builddir}/zshdb --no-init --no-highlight --basename --quiet --library $top_builddir \
   -x $quitcmd $debugged_script
 # $SH ${top_builddir}/zshdb -B -q -L $top_builddir -x $contcmd --command 'echo test1a'
 # $SH ${top_builddir}/zshdb --basename --badopt -q -L $top_builddir \

diff --git a/test/integration/sopts.tests b/test/integration/sopts.tests
@@ -1,6 +1,6 @@
 #!/bin/zsh -f
 # -*- shell-script -*-
-PS4='(%x:%I): [%?] zsh+ 
+PS4='(%x:%I): [%?] zsh+
 '
 set -o shwordsplit
 
@@ -13,4 +13,4 @@ quitcmd="${top_srcdir}/test/data/quit.cmd"
 contcmd="${top_srcdir}/test/data/quit.cmd"
 debugged_script="${top_srcdir}/test/example/dbg-test1.sh"
 
-$SH ${top_builddir}/zshdb -B --no-init -q -L $top_builddir -x $contcmd $debugged_script
+$SH ${top_builddir}/zshdb -B --no-init --no-highlight -q -L $top_builddir -x $contcmd $debugged_script