[Python-checkins] r85079 - in python/branches/release31-maint: Misc/NEWS runtests.sh

Wed Sep 29 00:34:05 CEST 2010

Author: r.david.murray
Date: Wed Sep 29 00:34:03 2010
New Revision: 85079
Log:
Merged revisions 85078 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r85078 | r.david.murray | 2010年09月28日 18:25:18 -0400 (2010年9月28日) | 2 lines
 
 #9628: fix runtests.sh -x option so more than one test can be excluded.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Misc/NEWS
 python/branches/release31-maint/runtests.sh
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================

--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Wed Sep 29 00:34:03 2010
@@ -611,6 +611,7 @@
 
 Tests
 -----
+- Issue #9628: fix runtests.sh -x option so more than one test can be excluded.
 
 - Issue #9894: Do not hardcode ENOENT in test_subprocess.
 
Modified: python/branches/release31-maint/runtests.sh
==============================================================================
--- python/branches/release31-maint/runtests.sh	(original)
+++ python/branches/release31-maint/runtests.sh	Wed Sep 29 00:34:03 2010
@@ -55,7 +55,7 @@
 TESTS=`(cd Lib/test; ls test_*.py | sed 's/\.py//')`
 ;;
 *-x)
- PAT="^(`echo $@ | sed 's/\.py//' | sed 's/ /|/'`)$"
+ PAT="^(`echo $@ | sed 's/\.py//g' | sed 's/ /|/g'`)$"
 TESTS=`(cd Lib/test; ls test_*.py | sed 's/\.py//' | egrep -v "$PAT")`
 ;;
 *)
