From b42b592b0787d20db947edddcf883470a85c62a2 Mon Sep 17 00:00:00 2001 From: Sean-M Date: Fri, 12 Apr 2013 12:01:14 -0400 Subject: [PATCH] Added argument to ignore new images. --- Test/script/regression.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Test/script/regression.py b/Test/script/regression.py index ff7fc85d98..b83451227a 100644 --- a/Test/script/regression.py +++ b/Test/script/regression.py @@ -72,6 +72,7 @@ class Args: self.contin = False self.gold_creation = False self.daily = False + self.fr = False def parse(self): global nxtproc @@ -140,6 +141,9 @@ class Args: elif arg == "-d" or arg == "--daily": printout("Running daily") self.daily = True + elif arg == "-fr" or arg == "--forcerun": + printout("Not downloading new images") + self.fr = True else: printout(usage()) return False @@ -1668,15 +1672,6 @@ def main(): global daycount global redo global passed - antin = ["ant"] - antin.append("-f") - antin.append(os.path.join("..","..","build.xml")) - antin.append("test-download-imgs") - if SYS is OS.CYGWIN: - subprocess.call(antin) - elif SYS is OS.WIN: - theproc = subprocess.Popen(antin, shell = True, stdout=subprocess.PIPE) - theproc.communicate() daycount = 0 failedbool = False redo = False @@ -1685,6 +1680,16 @@ def main(): database = Database() printout("") args = Args() + if(not args.fr): + antin = ["ant"] + antin.append("-f") + antin.append(os.path.join("..","..","build.xml")) + antin.append("test-download-imgs") + if SYS is OS.CYGWIN: + subprocess.call(antin) + elif SYS is OS.WIN: + theproc = subprocess.Popen(antin, shell = True, stdout=subprocess.PIPE) + theproc.communicate() attachl = [] passed = False # The arguments were given wrong: