Changeset 3296

Timestamp:

Aug 25, 2010 12:57:53 PM (14 years ago)

Author:

bennylp

Message:

Misc (re #1110): undo accidental checkin of run_continuous.py in previous commit

File:

• pjproject/trunk/tests/automated/run_continuous.py (modified) (5 diffs)

pjproject/trunk/tests/automated/run_continuous.py

@@ -8 +8 @@
 INTERVAL = 300
 DELAY = 0
-CMDLINE = ""
 
-def run_cmdline(group):
-        cmdline = CMDLINE + " --group " + group
-        return os.system(cmdline)
+def run_scenarios(scenarios, group):
+        # Run each scenario
+        rc = 0
+        for scenario in scenarios:
+                argv = []
+                argv.append("ccdash.py")
+                argv.append("scenario")
+                argv.append(scenario)
+                argv.append("--group")
+                argv.append(group)
+                thisrc = ccdash.main(argv)
+                if rc==0 and thisrc:
+                        rc = thisrc
+        return rc
 
 
@@ -19 +29 @@
 
 Usage:
-  run_continuous.py [options] "cmdline"
-
-where:
-  cmdline is command to be executed to perform the test. Typically, this is
-  a script that calls configure.py and run_scenario.py for each scenario to
-  be performed. See perform_test.sh.sample and perform_test.bat.sample for
-  sample scripts. Note that the cmdline will be called with added group
-  argument (e.g. --group Nightly).
+  run_continuous.py [options] scenario1.xml [scenario2.xml ...]
 
 options:
@@ -44 +47 @@
                 usage()
 
-        # Check args
+        # Splice list
+        scenarios = []
         i = 1
         while i < len(sys.argv):
@@ -55 +59 @@
                         print "Delay is set to %f minute(s)" % (DELAY / 60)
                 else:
-                        if CMDLINE:
-                                print "Error: cmdline already specified"
+                        # Check if scenario exists
+                        scenario = sys.argv[i]
+                        if not os.path.exists(scenario):
+                                print "Error: file " + scenario + " does not exist"
                                 sys.exit(1)
-                        CMDLINE = sys.argv[i]
+                        scenarios.append(scenario)
+                        print "Scenario %s added" % (scenario)
                 i = i + 1
 
-        if not CMDLINE:
-                print "Error: cmdline is needed"
+        if len(scenarios) < 1:
+                print "Error: scenario is required"
                 sys.exit(1)
 
@@ -93 +100 @@
                                 print "Will run %s after %f s.." % (group, DELAY)
                                 time.sleep(DELAY)
-                                rc = run_cmdline(group)
+                                rc = run_scenarios(scenarios, group)
                                 # Sleep even if something does change
                                 print str(datetime.datetime.now()) + \