about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-01-31 09:40:36 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-01-31 09:40:36 +0000
commit6a364de3e1e90be88e722962e599ab6ea2454495 (patch)
tree945ed5207249794320af2e5ff1b9879e7092dfa5
parent76512cdeb052408bf0bd79dc7cf43261b8c232ad (diff)
downloadzsh-6a364de3e1e90be88e722962e599ab6ea2454495.tar.gz
zsh-6a364de3e1e90be88e722962e599ab6ea2454495.tar.xz
zsh-6a364de3e1e90be88e722962e599ab6ea2454495.zip
Felipe: 30158: compgen test not useful with current bashcompinit
-rw-r--r--ChangeLog8
-rw-r--r--Test/.distfiles2
-rw-r--r--Test/Y04compgen.ztst21
-rw-r--r--Test/compgentest15
4 files changed, 7 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog
index 17d23f23a..9c5cff8d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-31  Peter Stephenson  <pws@csr.com>
+
+	* Felipe: 30158: Test/.distfiles, Test/compgentest,
+	Test/Y04compgen.ztst: compgen test is not useful with current
+	bashcopmpinit.
+
 2012-01-29  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	*  Richard Hartmann: 30140: Completion/X/Command/_mplayer:
@@ -15889,5 +15895,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5568 $
+* $Revision: 1.5569 $
 *****************************************************
diff --git a/Test/.distfiles b/Test/.distfiles
index 8a5d716f4..0e691743b 100644
--- a/Test/.distfiles
+++ b/Test/.distfiles
@@ -1,7 +1,6 @@
 DISTFILES_SRC='
 .cvsignore
 .distfiles
-compgentest
 A01grammar.ztst
 A02alias.ztst
 A03quoting.ztst
@@ -43,7 +42,6 @@ V06parameter.ztst
 Y01completion.ztst
 Y02compmatch.ztst
 Y03arguments.ztst
-Y04compgen.ztst
 comptest
 runtests.zsh
 ztst.zsh
diff --git a/Test/Y04compgen.ztst b/Test/Y04compgen.ztst
deleted file mode 100644
index 90dce6148..000000000
--- a/Test/Y04compgen.ztst
+++ /dev/null
@@ -1,21 +0,0 @@
-# Tests for bash compgen compatibility.
-
-%prep
-  if ( zmodload zsh/parameter ) >/dev/null 2>&1; then
-    . $ZTST_srcdir/compgentest
-    comptestinit -z $ZTST_testdir/../Src/zsh &&
-  else
-    ZTST_unimplemented="the zsh/parameter module is not available"
-  fi
-
-%test
-
-  comptest $': \t\t\t\t\t\t\t'
-0:bash compatibility: compgen -W
->abc
->abe
->ab
-
-%clean
-
-  zmodload -ui zsh/parameter
diff --git a/Test/compgentest b/Test/compgentest
deleted file mode 100644
index 26b202c43..000000000
--- a/Test/compgentest
+++ /dev/null
@@ -1,15 +0,0 @@
-comptestinit () {
-  
-  setopt extendedglob
-  [[ -d $ZTST_testdir/Modules/zsh ]] && module_path=( $ZTST_testdir/Modules )
-
-  zmodload -i zsh/parameter || return $?
-  autoload -Uz bashcompinit || return $?
-  bashcompinit || return $?
-
-}
-
-comptest () {
-  compgen -W 'abc abe ab a def' ab
-}
-