From a0a89b90062fb1fb8938a3b3785a7bef5f23a9db Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Tue, 28 Sep 2010 22:34:03 +0000 Subject: [PATCH] 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. ........ --- Misc/NEWS | 1 + runtests.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index ee5a3fa8d61..b6cfbebb559 100644 --- 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 2d3cfc8969b..d7b46467618 100755 --- 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")` ;; *)