summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-02-23 04:22:21 +0000
committerAaron Griffin <aaron@archlinux.org>2007-02-23 04:22:21 +0000
commit6cd69fa9ff66a3dd77f9773bd7fb62e79512f5e7 (patch)
tree456b66138b87373dae12dc6b8fe73c74f3887d4f
parent8e1cdc5f8d78a1a4d3c253e8c3abf1c3d18aa7ea (diff)
downloadpacman-6cd69fa9ff66a3dd77f9773bd7fb62e79512f5e7.tar.xz
* Removed a stray print statement left in there
* Fail when no tests defined * Added --manual-confirm to help with hand testing
-rwxr-xr-xpactest/pactest.py18
-rwxr-xr-xpactest/pmtest.py4
2 files changed, 15 insertions, 7 deletions
diff --git a/pactest/pactest.py b/pactest/pactest.py
index c7ce619a..7166a9d4 100755
--- a/pactest/pactest.py
+++ b/pactest/pactest.py
@@ -34,7 +34,6 @@ def resolveBinPath(option, opt_str, value, parser):
def globTests(option, opt_str, value, parser):
globlist = []
globlist.extend(glob.glob(value))
- print "globlist=%s" % globlist
setattr(parser.values, option.dest, globlist)
def createOptParser():
@@ -68,6 +67,9 @@ def createOptParser():
parser.add_option("--valgrind", action = "store_true",
dest = "valgrind", default = False,
help = "use valgrind while calling pacman")
+ parser.add_option("--manual-confirm", action = "store_true",
+ dest = "manualconfirm", default = False,
+ help = "do not use --noconfirm for pacman calls")
return parser
@@ -84,11 +86,15 @@ if __name__ == "__main__":
env.pacman["nolog"] = opts.nolog
env.pacman["gdb"] = opts.gdb
env.pacman["valgrind"] = opts.valgrind
- for i in opts.testcases:
- env.addtest(i)
+ env.pacman["manual-confirm"] = opts.manualconfirm
- # run tests and print overall results
- env.run()
- env.results()
+ if len(opts.testcases) == 0:
+ print "no tests defined, nothing to do"
+ else:
+ for i in opts.testcases: env.addtest(i)
+
+ # run tests and print overall results
+ env.run()
+ env.results()
# vim: set ts=4 sw=4 et:
diff --git a/pactest/pmtest.py b/pactest/pmtest.py
index f7538e04..0332f231 100755
--- a/pactest/pmtest.py
+++ b/pactest/pmtest.py
@@ -188,7 +188,9 @@ class pmtest:
cmd.append("libtool gdb --args")
if pacman["valgrind"]:
cmd.append("valgrind --tool=memcheck --leak-check=full --show-reachable=yes")
- cmd.append("%s --noconfirm --config=%s --root=%s" \
+ if not pacman["manual-confirm"]:
+ cmd.append("--noconfirm")
+ cmd.append("%s --config=%s --root=%s" \
% (pacman["bin"], os.path.join(self.root, PACCONF), self.root))
if pacman["debug"]:
cmd.append("--debug=%s" % pacman["debug"])