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 (Tue, 28 Sep 2010) | 2 lines

  #9628: fix runtests.sh -x option so more than one test can be excluded.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index ee5a3fa8d61cce08fc729cce2c497c09ea110e0b..b6cfbebb559eeaeed35c76930b8be0eb60257984 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -611,6 +611,7 @@ Build
 
 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.
 

diff --git a/runtests.sh b/runtests.sh
index 2d3cfc8969be3df21627097b547deda1c2db8c3e..d7b46467618526b49cf3607579f77c3e222b62c8 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -55,7 +55,7 @@ case "$#$EXCEPT" in
     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")`
     ;;
 *)