[Zope-CVS] CVS: Packages/TestScripts - autotester.py:1.26 windows_config.xml:1.4 linux_config.xml:1.5

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/TestScripts
In directory cvs.zope.org:/tmp/cvs-serv12024

Modified Files:
	autotester.py windows_config.xml linux_config.xml 
Log Message:
Real changes:
- rename <command> to <script>, since it always runs a Python script
- add a <command> that does not use the Python interpreter


=== Packages/TestScripts/autotester.py 1.25 => 1.26 ===
--- Packages/TestScripts/autotester.py:1.25	Fri Mar  7 13:37:24 2003
+++ Packages/TestScripts/autotester.py	Fri Mar  7 14:23:42 2003
@@ -37,8 +37,9 @@
 # executor
 def execute(location,python,command,options):
     os.chdir(os.path.join(sandbox,location))
-    note("Running:", python, command, options)
-    (i,c,e) = os.popen3(python+' '+command+' '+options)
+    cmd = ("%s %s %s" % (python, command, options)).strip()
+    note("Running:", cmd)
+    (i,c,e) = os.popen3(cmd)
     i.close()
     ct = NonBlockingReader(c)
     et = NonBlockingReader(e)
@@ -51,10 +52,17 @@
 def xml_execute(commands,p):
     result=[]
     for command in commands:
-        result.append(execute(command['location'][0](),
-                              p,
-                              command['command'][0](),
-                              command['options'][0]()))
+        options = command['options'][0]()
+        if command.get('script') is not None:
+            if command.get('command') is not None:
+                raise ValueError("bad command: exactly one of"
+                                 " 'script' or 'command' may be used")
+            script = command['script'][0]()
+            s = execute(command['location'][0](), p, script, options)
+        else:
+            cmd = command['command'][0]()
+            s = execute(command['location'][0](), cmd, options, '')
+        result.append(s)
     return '\n'.join(result)
 
 def get_module_info(module):


=== Packages/TestScripts/windows_config.xml 1.3 => 1.4 ===
--- Packages/TestScripts/windows_config.xml:1.3	Thu Jan  2 09:39:04 2003
+++ Packages/TestScripts/windows_config.xml	Fri Mar  7 14:23:42 2003
@@ -26,12 +26,12 @@
     </environment>
     <build>
      <location>Zope</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext -i</options>
     </build>
     <test>
      <location>Zope</location>
-     <command>utilities/testrunner.py</command>
+     <script>utilities/testrunner.py</script>
      <options>-v 0 -a</options>
     </test>
     <module>
@@ -52,12 +52,12 @@
     </environment>
     <build>
      <location>Zope</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext -i</options>
     </build>
     <test>
      <location>Zope/lib/python/Products</location>
-     <command>all_cmf_tests.py</command>
+     <script>all_cmf_tests.py</script>
      <options></options>
     </test>
     <module>
@@ -83,12 +83,12 @@
     </environment>
     <build>
      <location>Zope</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext -i</options>
     </build>
     <test>
      <location>Zope</location>
-     <command>utilities/testrunner.py</command>
+     <script>utilities/testrunner.py</script>
      <options>-v 0 -a</options>
     </test>
     <module>
@@ -105,12 +105,12 @@
     <email>zope3-dev@zope.org</email>
     <build>
      <location>Zope3</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext -i</options>
     </build>
     <test>
      <location>Zope3</location>
-     <command>test.py</command>
+     <script>test.py</script>
      <options></options>
     </test>
     <module>


=== Packages/TestScripts/linux_config.xml 1.4 => 1.5 ===
--- Packages/TestScripts/linux_config.xml:1.4	Wed Feb 26 12:07:46 2003
+++ Packages/TestScripts/linux_config.xml	Fri Mar  7 14:23:42 2003
@@ -26,12 +26,12 @@
     </environment>
     <build>
      <location>Zope</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext --inplace</options>
     </build>
     <test>
      <location>Zope</location>
-     <command>utilities/testrunner.py</command>
+     <script>utilities/testrunner.py</script>
      <options>-v 0 -a</options>
     </test>
     <module>
@@ -52,12 +52,12 @@
     </environment>
     <build>
      <location>Zope</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext --inplace</options>
     </build>
     <test>
      <location>Zope/lib/python/Products</location>
-     <command>all_cmf_tests.py</command>
+     <script>all_cmf_tests.py</script>
      <options></options>
     </test>
     <module>
@@ -83,12 +83,12 @@
     </environment>
     <build>
      <location>Zope</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext --inplace</options>
     </build>
     <test>
      <location>Zope</location>
-     <command>utilities/testrunner.py</command>
+     <script>utilities/testrunner.py</script>
      <options>-v 0 -a</options>
     </test>
     <module>
@@ -105,12 +105,12 @@
     <email>zope3-dev@zope.org</email>
     <build>
      <location>Zope3</location>
-     <command>setup.py</command>
+     <script>setup.py</script>
      <options>build_ext --inplace</options>
     </build>
     <test>
      <location>Zope3</location>
-     <command>test.py</command>
+     <script>test.py</script>
      <options></options>
     </test>
     <module>