Changeset 3295

Timestamp:

Aug 25, 2010 12:51:29 PM (14 years ago)

Author:

bennylp

Message:

Misc (re #1110): force SVN eol-style to LF for files which are to be manipulated by the configure script, or otherwise the configure script on msys (mingw) will fail to update them

Location:

pjproject/trunk

Files:

• build.mak.in (modified) (1 prop)
• build/cc-auto.mak.in (modified) (1 prop)
• build/os-auto.mak.in (modified) (1 prop)
• pjlib-util/build/os-auto.mak.in (modified) (1 prop)
• pjlib/build/os-auto.mak.in (modified) (1 prop)
• pjlib/include/pj/compat/m_auto.h.in (modified) (1 prop)
• pjlib/include/pj/compat/os_auto.h.in (modified) (1 prop)
• pjmedia/build/os-auto.mak.in (modified) (1 prop)
• pjmedia/include/pjmedia-codec/config_auto.h.in (modified) (1 prop)
• pjmedia/include/pjmedia/config_auto.h.in (modified) (1 prop)
• pjsip/build/os-auto.mak.in (modified) (1 prop)
• pjsip/include/pjsip/sip_autoconf.h.in (modified) (1 prop)
• tests/automated/run_continuous.py (modified) (5 diffs)
• third_party/build/os-auto.mak.in (modified) (1 prop)
• third_party/build/portaudio/os-auto.mak.in (modified) (1 prop)

pjproject/trunk/tests/automated/run_continuous.py

@@ -8 +8 @@
 INTERVAL = 300
 DELAY = 0
+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
+def run_cmdline(group):
+        cmdline = CMDLINE + " --group " + group
+        return os.system(cmdline)
 
 
@@ -29 +19 @@
 
 Usage:
-  run_continuous.py [options] scenario1.xml [scenario2.xml ...]
+  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).
 
 options:
@@ -47 +44 @@
                 usage()
 
-        # Splice list
-        scenarios = []
+        # Check args
         i = 1
         while i < len(sys.argv):
@@ -59 +55 @@
                         print "Delay is set to %f minute(s)" % (DELAY / 60)
                 else:
-                        # Check if scenario exists
-                        scenario = sys.argv[i]
-                        if not os.path.exists(scenario):
-                                print "Error: file " + scenario + " does not exist"
+                        if CMDLINE:
+                                print "Error: cmdline already specified"
                                 sys.exit(1)
-                        scenarios.append(scenario)
-                        print "Scenario %s added" % (scenario)
+                        CMDLINE = sys.argv[i]
                 i = i + 1
 
-        if len(scenarios) < 1:
-                print "Error: scenario is required"
+        if not CMDLINE:
+                print "Error: cmdline is needed"
                 sys.exit(1)
 
@@ -100 +93 @@
                                 print "Will run %s after %f s.." % (group, DELAY)
                                 time.sleep(DELAY)
-                                rc = run_scenarios(scenarios, group)
+                                rc = run_cmdline(group)
                                 # Sleep even if something does change
                                 print str(datetime.datetime.now()) + \