[SCM] debian-live/autotesting branch, master, updated. 3921abf20466c46554b088464a43cbdf333ec7c2

Brendan M. Sleight (none) bms at brum.
Sat May 8 20:43:51 UTC 2010


The following commit has been merged in the master branch:
commit 3921abf20466c46554b088464a43cbdf333ec7c2
Author: Brendan M. Sleight <bms at brum.(none)>
Date:   Sat May 8 21:44:29 2010 +0100

    re-vamping the list of tests. Adding tweet option.

diff --git a/tests-source/build-60alpha1-amd64-iso-hybrid-all-monthly.xml b/tests-source/build-60alpha1-amd64-iso-hybrid-all-monthly.xml
new file mode 100644
index 0000000..a3311ad
--- /dev/null
+++ b/tests-source/build-60alpha1-amd64-iso-hybrid-all-monthly.xml
@@ -0,0 +1,15 @@
+<autotesting>
+  <merge>
+    <common>common-squeeze-build.xml</common>
+    <processors>
+      <processor>processor-amd64.xml</processor>
+    </processors>
+    <images>
+      <image>images-iso-hybrid.xml</image>
+    </images>
+    <packages>
+      <package>packages-all.xml</package>
+    </packages>
+    <frequency>frequency-monthly.xml</frequency>
+  </merge>
+</autotesting>
diff --git a/tests-source/build-60alpha1-i386-iso-hybrid-all-monthly.xml b/tests-source/build-60alpha1-i386-iso-hybrid-all-monthly.xml
new file mode 100644
index 0000000..449cd6a
--- /dev/null
+++ b/tests-source/build-60alpha1-i386-iso-hybrid-all-monthly.xml
@@ -0,0 +1,15 @@
+<autotesting>
+  <merge>
+    <common>common-squeeze-build.xml</common>
+    <processors>
+      <processor>processor-i386.xml</processor>
+    </processors>
+    <images>
+      <image>images-iso-hybrid.xml</image>
+    </images>
+    <packages>
+      <package>packages-all.xml</package>
+    </packages>
+    <frequency>frequency-monthly.xml</frequency>
+  </merge>
+</autotesting>
diff --git a/tests-source/build-60alpha1-i386-iso-hybrid-xfce-daily.xml b/tests-source/build-60alpha1-i386-iso-hybrid-xfce-daily.xml
new file mode 100644
index 0000000..78d65c3
--- /dev/null
+++ b/tests-source/build-60alpha1-i386-iso-hybrid-xfce-daily.xml
@@ -0,0 +1,15 @@
+<autotesting>
+  <merge>
+    <common>common-squeeze-build.xml</common>
+    <processors>
+      <processor>processor-i386.xml</processor>
+    </processors>
+    <images>
+      <image>images-iso-hybrid.xml</image>
+    </images>
+    <packages>
+      <package>packages-xfce.xml</package>
+    </packages>
+    <frequency>frequency-daily.xml</frequency>
+  </merge>
+</autotesting>
diff --git a/tests-source/build-60alpha1-powerpc-iso-all-monthly.xml b/tests-source/build-60alpha1-powerpc-iso-all-monthly.xml
new file mode 100644
index 0000000..3d95a5f
--- /dev/null
+++ b/tests-source/build-60alpha1-powerpc-iso-all-monthly.xml
@@ -0,0 +1,15 @@
+<autotesting>
+  <merge>
+    <common>common-squeeze-build.xml</common>
+    <processors>
+      <processor>processor-powerpc.xml</processor>
+    </processors>
+    <images>
+      <image>images-iso.xml</image>
+    </images>
+    <packages>
+      <package>packages-all.xml</package>
+    </packages>
+    <frequency>frequency-monthly.xml</frequency>
+  </merge>
+</autotesting>
diff --git a/tests-source/build-stage1.xml b/tests-source/build-stage1.xml
new file mode 100644
index 0000000..87303ec
--- /dev/null
+++ b/tests-source/build-stage1.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" version="1.0" encoding="iso-8859-1" indent="yes"/>
+<xsl:template match="/">
+
+<xsl:variable name="parts">
+    <xsl:text>./parts/</xsl:text>
+</xsl:variable>
+
+
+<autotesting>
+  <source>
+    <tests>
+      <processors>
+      <xsl:for-each select="/autotesting/merge/processors/processor">
+        <xsl:variable name="file">
+          <xsl:value-of select="$parts"/><xsl:value-of select="."/>
+        </xsl:variable>
+        <xsl:for-each select="document($file)//autotesting/common/processors/processor">
+          <xsl:copy-of select="."/>
+        </xsl:for-each>
+      </xsl:for-each>
+      </processors>
+      <images>
+      <xsl:for-each select="/autotesting/merge/images/image">
+        <xsl:variable name="file">
+          <xsl:value-of select="$parts"/><xsl:value-of select="."/>
+        </xsl:variable>
+        <xsl:for-each select="document($file)//autotesting/common/images/image">
+          <xsl:copy-of select="."/>
+        </xsl:for-each>
+      </xsl:for-each>
+      </images>
+      <packages>
+      <xsl:for-each select="/autotesting/merge/packages/package">
+        <xsl:variable name="file">
+          <xsl:value-of select="$parts"/><xsl:value-of select="."/>
+        </xsl:variable>
+        <xsl:for-each select="document($file)//autotesting/common/packages/package">
+          <xsl:copy-of select="."/>
+        </xsl:for-each>
+      </xsl:for-each>
+      </packages>
+    </tests>
+    <xsl:variable name="frequency" >
+      <xsl:value-of select="$parts"/><xsl:value-of select="/autotesting/merge/frequency"/>
+    </xsl:variable>
+    <xsl:copy-of select="document($frequency)//autotesting/common/frequency" />
+    
+    <xsl:variable name="common" >
+      <xsl:value-of select="$parts"/><xsl:value-of select="/autotesting/merge/common"/>
+    </xsl:variable>
+    <xsl:copy-of select="document($common)//autotesting/common/*" />
+  </source>
+</autotesting>
+
+</xsl:template>
+</xsl:stylesheet>
diff --git a/tests-source/debian-live-60alpha1-all.xml b/tests-source/debian-live-60alpha1-all.xml
deleted file mode 100644
index 3c7016e..0000000
--- a/tests-source/debian-live-60alpha1-all.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Maybe this does not have to be via XML. 
-     But I quite like the idea of a master XML document to make
-     the long document containing all the lists.
-     It also removes typos and a chance to do a real xml transform -->
-<autotesting>
-  <source>
-    <tests>
-      <processors>
-        <processor>
-          <name>i386</name>
-          <binary>qemu-system-i386</binary>
-        </processor>
-        <processor>
-          <name>amd64</name>
-          <binary>qemu-system-x86_64</binary>
-        </processor>
-        <processor>
-          <name>powerpc</name>
-          <binary>qemu-system-ppc</binary>
-        </processor>
-      </processors>
-      <images>
-        <image>
-          <name>iso-hybrid</name>
-          <nametwo>boot-as-cdrom</nametwo>
-          <extension>.iso</extension>
-          <qemu_options>-cdrom</qemu_options>
-        </image>
-        <image>
-          <name>iso-hybrid</name>
-          <nametwo>boot-as-usb</nametwo>
-          <extension>.iso</extension>
-          <qemu_options>-hda</qemu_options>
-        </image>
-      </images>
-      <packages>
-        <package>gnome-desktop</package>
-        <package>kde-desktop</package>
-        <package>lxde-desktop</package>
-        <package>rescue</package>
-        <package>standard</package>
-        <package>xfce-desktop</package>
-      </packages>
-    </tests>
-    <root_url>http://live.debian.net/cdimage/squeeze-builds/current/</root_url>
-    <md5sum>MD5SUMS</md5sum>
-    <filename_start>debian-live-60alpha1</filename_start>
-    <background>http://live.debian.net/image.png</background>
-    <title>Debian Live 60alpha1</title>
-    <description>Debian Live. Daily build of 60alpha1, </description>
-    <frequency>daily</frequency>
-    <qemu>
-      <xscreen>800x600x24</xscreen>
-      <options>-cdrom</options>
-      <pause>10</pause>
-      <sendkeys>kp_enter</sendkeys>
-      <time>600</time>
-    </qemu>
-    <output>
-      <keep>4</keep>
-      <root>/var/www/autotesting/</root>
-      <local>debian-live/60alpha1/</local>
-<!--      <local>debian-live/5.01/i386/gnome/</local> -->
-      <video>autotesting.ogv</video>
-      <screenshots>
-        <final>final-screenshot.png</final>
-        <montage>montage-of-video-frames.png</montage>
-      </screenshots>
-    </output>
-  </source>
-</autotesting>
diff --git a/tests-source/debian-live-60alpha1-hdd-standard.xml b/tests-source/debian-live-60alpha1-hdd-standard.xml
deleted file mode 100644
index 61375a2..0000000
--- a/tests-source/debian-live-60alpha1-hdd-standard.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Maybe this does not have to be via XML. 
-     But I quite like the idea of a master XML document to make
-     the long document containing all the lists.
-     It also removes typos and a chance to do a real xml transform -->
-<autotesting>
-  <source>
-    <tests>
-      <processors>
-        <processor>
-          <name>i386</name>
-          <binary>qemu-system-i386</binary>
-        </processor>
-        <processor>
-          <name>amd64</name>
-          <binary>qemu-system-x86_64</binary>
-        </processor>
-        <processor>
-          <name>powerpc</name>
-          <binary>qemu-system-ppc</binary>
-        </processor>
-      </processors>
-      <images>
-        <image>
-          <name>iso-hybrid</name>
-          <nametwo>boot-as-usb</nametwo>
-          <extension>.iso</extension>
-          <qemu_options>-hda</qemu_options>
-        </image>
-      </images>
-      <packages>
-        <package>standard</package>
-      </packages>
-    </tests>
-    <root_url>http://live.debian.net/cdimage/squeeze-builds/current/</root_url>
-    <md5sum>MD5SUMS</md5sum>
-    <filename_start>debian-live-60alpha1</filename_start>
-    <background>http://live.debian.net/image.png</background>
-    <title>Debian Live 60alpha1</title>
-    <description>Debian Live. Daily build of 60alpha1, </description>
-    <frequency>daily</frequency>
-    <qemu>
-      <xscreen>800x600x24</xscreen>
-      <options>-cdrom</options>
-      <pause>10</pause>
-      <sendkeys>kp_enter</sendkeys>
-      <time>600</time>
-    </qemu>
-    <output>
-      <keep>4</keep>
-      <root>/var/www/autotesting/</root>
-      <local>debian-live/60alpha1/</local>
-<!--      <local>debian-live/5.01/i386/gnome/</local> -->
-      <video>autotesting.ogv</video>
-      <screenshots>
-        <final>final-screenshot.png</final>
-        <montage>montage-of-video-frames.png</montage>
-      </screenshots>
-    </output>
-  </source>
-</autotesting>
diff --git a/tests-source/debian-live-60alpha1-i386-iso-xfce.xml b/tests-source/debian-live-60alpha1-i386-iso-xfce.xml
deleted file mode 100644
index e259c4b..0000000
--- a/tests-source/debian-live-60alpha1-i386-iso-xfce.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Maybe this does not have to be via XML. 
-     But I quite like the idea of a master XML document to make
-     the long document containing all the lists.
-     It also removes typos and a chance to do a real xml transform -->
-<autotesting>
-  <source>
-    <tests>
-      <processors>
-        <processor>
-          <name>i386</name>
-          <binary>qemu-system-i386</binary>
-        </processor>
-      </processors>
-      <images>
-        <image>
-          <name>iso-hybrid</name>
-          <nametwo>boot-as-cdrom</nametwo>
-          <extension>.iso</extension>
-          <qemu_options>-cdrom</qemu_options>
-        </image>
-      </images>
-      <packages>
-        <package>xfce-desktop</package>
-      </packages>
-    </tests>
-    <root_url>http://live.debian.net/cdimage/squeeze-builds/current/</root_url>
-    <md5sum>MD5SUMS</md5sum>
-    <filename_start>debian-live-60alpha1</filename_start>
-    <background>http://live.debian.net/image.png</background>
-    <title>Debian Live 60alpha1</title>
-    <description>Debian Live. Daily build of 60alpha1, </description>
-    <frequency>daily</frequency>
-    <qemu>
-      <xscreen>800x600x24</xscreen>
-      <options>-cdrom</options>
-      <pause>10</pause>
-      <sendkeys>kp_enter</sendkeys>
-      <time>600</time>
-    </qemu>
-    <output>
-      <keep>4</keep>
-      <root>/var/www/autotesting/</root>
-      <local>debian-live/60alpha1/</local>
-<!--      <local>debian-live/5.01/i386/gnome/</local> -->
-      <video>autotesting.ogv</video>
-      <screenshots>
-        <final>final-screenshot.png</final>
-        <montage>montage-of-video-frames.png</montage>
-      </screenshots>
-    </output>
-  </source>
-</autotesting>
diff --git a/tests-source/debian-live-all.xml b/tests-source/debian-live-all.xml
deleted file mode 100644
index ecd1ed2..0000000
--- a/tests-source/debian-live-all.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Used to make debian-live-5.01-current-all.xml -->
-<!-- Maybe this does not have to be via XML. 
-     But I quite like the idea of a master XML document to make
-     the long document containing all the lists.
-     It also removes typos and a chance to do a real xml transform -->
-<autotesting>
-  <source>
-    <tests>
-      <processors>
-        <processor>
-          <name>i386</name>
-          <binary>qemu-system-i386</binary>
-        </processor>
-        <processor>
-          <name>amd64</name>
-          <binary>qemu-system-x86_64</binary>
-        </processor>
-      </processors>
-      <images>
-        <image>
-          <name>iso-cd</name>
-          <extension>.iso</extension>
-          <qemu_options>-cdrom</qemu_options>
-        </image>
-        <image>
-          <name>usb-hdd</name>
-          <extension>.img</extension>
-          <qemu_options>-hda</qemu_options>
-        </image>
-      </images>
-      <packages>
-        <package>gnome-desktop</package>
-        <package>kde-desktop</package>
-        <package>lxde-desktop</package>
-        <package>rescue</package>
-        <package>standard</package>
-        <package>xfce-desktop</package>
-      </packages>
-    </tests>
-    <root_url>http://cdimage.debian.org/cdimage/release/current-live/</root_url>
-    <filename_start>debian-live-503</filename_start>
-    <background>http://live.debian.net/gitweb?p=homepage.git;a=blob_plain;f=images/debian-live.png;hb=master</background>
-    <title>Debian Live 5.03</title>
-    <description>Debian Live. Daily build of 5.03, </description>
-    <frequency>monthly</frequency>
-    <qemu>
-      <xscreen>800x600x24</xscreen>
-      <options>-cdrom</options>
-      <pause>10</pause>
-      <sendkeys>kp_enter</sendkeys>
-      <time>600</time>
-    </qemu>
-    <output>
-      <keep>4</keep>
-      <root>/var/www/autotesting/</root>
-      <local>debian-live/5.03/</local>
-<!--      <local>debian-live/5.01/i386/gnome/</local> -->
-      <video>autotesting.ogv</video>
-      <screenshots>
-        <final>final-screenshot.png</final>
-        <montage>montage-of-video-frames.png</montage>
-      </screenshots>
-    </output>
-  </source>
-</autotesting>
diff --git a/tests-source/debian-live-i386-iso-xfce.xml b/tests-source/debian-live-i386-iso-xfce.xml
deleted file mode 100644
index e028d7a..0000000
--- a/tests-source/debian-live-i386-iso-xfce.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Used to make debian-live-5.01-current-all.xml -->
-<!-- Maybe this does not have to be via XML. 
-     But I quite like the idea of a master XML document to make
-     the long document containing all the lists.
-     It also removes typos and a chance to do a real xml transform -->
-<autotesting>
-  <source>
-    <tests>
-      <processors>
-        <processor>
-          <name>i386</name>
-          <binary>qemu-system-i386</binary>
-        </processor>
-      </processors>
-      <images>
-        <image>
-          <name>iso-cd</name>
-          <extension>.iso</extension>
-          <qemu_options>-cdrom</qemu_options>
-        </image>
-      </images>
-      <packages>
-        <package>xfce-desktop</package>
-      </packages>
-    </tests>
-    <root_url>http://cdimage.debian.org/cdimage/release/current-live/</root_url>
-    <filename_start>debian-live-503</filename_start>
-    <background>http://live.debian.net/gitweb?p=homepage.git;a=blob_plain;f=images/debian-live.png;hb=master</background>
-    <title>Debian Live 5.03</title>
-    <description>Debian Live. Daily build of 5.03, </description>
-    <frequency>daily</frequency>
-    <qemu>
-      <xscreen>800x600x24</xscreen>
-      <options>-cdrom</options>
-      <pause>10</pause>
-      <sendkeys>kp_enter</sendkeys>
-      <time>600</time>
-    </qemu>
-    <output>
-      <keep>4</keep>
-      <root>/var/www/autotesting/</root>
-      <local>debian-live/5.03/</local>
-<!--      <local>debian-live/5.01/i386/gnome/</local> -->
-      <video>autotesting.ogv</video>
-      <screenshots>
-        <final>final-screenshot.png</final>
-        <montage>montage-of-video-frames.png</montage>
-      </screenshots>
-    </output>
-  </source>
-</autotesting>
diff --git a/tests-source/debian-live-i386-iso.xml b/tests-source/debian-live-i386-iso.xml
deleted file mode 100644
index 547dae0..0000000
--- a/tests-source/debian-live-i386-iso.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Used to make debian-live-5.01-current-all.xml -->
-<!-- Maybe this does not have to be via XML. 
-     But I quite like the idea of a master XML document to make
-     the long document containing all the lists.
-     It also removes typos and a chance to do a real xml transform -->
-<autotesting>
-  <source>
-    <tests>
-      <processors>
-        <processor>
-          <name>i386</name>
-          <binary>qemu-system-i386</binary>
-        </processor>
-      </processors>
-      <images>
-        <image>
-          <name>iso-cd</name>
-          <extension>.iso</extension>
-          <qemu_options>-cdrom</qemu_options>
-        </image>
-      </images>
-      <packages>
-        <package>gnome-desktop</package>
-        <package>lxde-desktop</package>
-        <package>rescue</package>
-        <package>standard</package>
-        <package>xfce-desktop</package>
-      </packages>
-    </tests>
-    <root_url>http://cdimage.debian.org/cdimage/release/current-live/</root_url>
-    <filename_start>debian-live-503</filename_start>
-    <background>http://live.debian.net/gitweb?p=homepage.git;a=blob_plain;f=images/debian-live.png;hb=master</background>
-    <title>Debian Live 5.03</title>
-    <description>Debian Live. Daily build of 5.03, </description>
-    <frequency>monthly</frequency>
-    <qemu>
-      <xscreen>800x600x24</xscreen>
-      <options>-cdrom</options>
-      <pause>10</pause>
-      <sendkeys>kp_enter</sendkeys>
-      <time>600</time>
-    </qemu>
-    <output>
-      <keep>4</keep>
-      <root>/var/www/autotesting/</root>
-      <local>debian-live/5.03/</local>
-<!--      <local>debian-live/5.01/i386/gnome/</local> -->
-      <video>autotesting.ogv</video>
-      <screenshots>
-        <final>final-screenshot.png</final>
-        <montage>montage-of-video-frames.png</montage>
-      </screenshots>
-    </output>
-  </source>
-</autotesting>
diff --git a/tests-source/merge-list.xml b/tests-source/merge-list.xml
new file mode 100644
index 0000000..e469382
--- /dev/null
+++ b/tests-source/merge-list.xml
@@ -0,0 +1,14 @@
+<autotesting>
+  <merge>
+    <files>
+      <!-- Daily -->
+      <file>build-60alpha1-i386-iso-hybrid-xfce-daily.xml</file>
+      <file>webconverger-daily.xml</file>
+      <file>morphix-lightgui.xml</file>
+      <!-- Monthly -->
+      <file>build-60alpha1-i386-iso-hybrid-all-monthly.xml</file>
+      <file>build-60alpha1-amd64-iso-hybrid-all-monthly.xml</file>
+      <file>build-60alpha1-powerpc-iso-all-monthly.xml</file>
+    </files>
+  </merge>
+</autotesting>
diff --git a/tests-source/merge-tests.xml b/tests-source/merge-tests.xml
new file mode 100644
index 0000000..2aa3a61
--- /dev/null
+++ b/tests-source/merge-tests.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" version="1.0" encoding="iso-8859-1" indent="yes"/>
+<xsl:template match="/">
+
+<autotesting>
+  <tests> 
+  <xsl:for-each select="/autotesting/merge/files/file">
+    <xsl:variable name="file" select="."/>
+    <xsl:for-each select="document($file)//autotesting/tests/test">
+      <xsl:copy-of select="."/>
+    </xsl:for-each>
+  </xsl:for-each>
+  </tests>
+</autotesting>
+
+</xsl:template>
+</xsl:stylesheet>
diff --git a/tests-source/parts/common-squeeze-build.xml b/tests-source/parts/common-squeeze-build.xml
new file mode 100644
index 0000000..f929aa9
--- /dev/null
+++ b/tests-source/parts/common-squeeze-build.xml
@@ -0,0 +1,28 @@
+<autotesting>
+  <common>
+    <root_url>http://live.debian.net/cdimage/squeeze-builds/current/</root_url>
+    <md5sum>MD5SUMS</md5sum>
+    <filename_start>debian-live-60alpha1</filename_start>
+    <background>http://live.debian.net/image.png</background>
+    <title>Debian Live 60alpha1</title>
+    <description>Debian Live. 60alpha1, </description>
+    <qemu>
+      <xscreen>800x600x24</xscreen>
+      <options>-cdrom</options>
+      <pause>10</pause>
+      <sendkeys>kp_enter</sendkeys>
+      <time>600</time>
+    </qemu>
+    <output>
+      <keep>4</keep>
+      <root>/var/www/autotesting/</root>
+      <local>debian-live/60alpha1/</local>
+<!--      <local>debian-live/5.01/i386/gnome/</local> -->
+      <video>autotesting.ogv</video>
+      <screenshots>
+        <final>final-screenshot.png</final>
+        <montage>montage-of-video-frames.png</montage>
+      </screenshots>
+    </output>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/frequency-daily.xml b/tests-source/parts/frequency-daily.xml
new file mode 100644
index 0000000..d105882
--- /dev/null
+++ b/tests-source/parts/frequency-daily.xml
@@ -0,0 +1,5 @@
+<autotesting>
+  <common>
+    <frequency>daily</frequency>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/frequency-monthly.xml b/tests-source/parts/frequency-monthly.xml
new file mode 100644
index 0000000..5c4b82b
--- /dev/null
+++ b/tests-source/parts/frequency-monthly.xml
@@ -0,0 +1,5 @@
+<autotesting>
+  <common>
+    <frequency>monthly</frequency>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/frequency-weekly.xml b/tests-source/parts/frequency-weekly.xml
new file mode 100644
index 0000000..3f2d43b
--- /dev/null
+++ b/tests-source/parts/frequency-weekly.xml
@@ -0,0 +1,5 @@
+<autotesting>
+  <common>
+    <frequency>weekly</frequency>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/images-iso-hybrid.xml b/tests-source/parts/images-iso-hybrid.xml
new file mode 100644
index 0000000..317e0b3
--- /dev/null
+++ b/tests-source/parts/images-iso-hybrid.xml
@@ -0,0 +1,18 @@
+<autotesting>
+  <common>
+      <images>
+        <image>
+          <name>iso-hybrid</name>
+          <nametwo>boot-as-cdrom</nametwo>
+          <extension>.iso</extension>
+          <qemu_options>-cdrom</qemu_options>
+        </image>
+        <image>
+          <name>iso-hybrid</name>
+          <nametwo>boot-as-usb</nametwo>
+          <extension>.iso</extension>
+          <qemu_options>-hda</qemu_options>
+        </image>
+      </images>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/images-iso.xml b/tests-source/parts/images-iso.xml
new file mode 100644
index 0000000..1bc6a6b
--- /dev/null
+++ b/tests-source/parts/images-iso.xml
@@ -0,0 +1,11 @@
+<autotesting>
+  <common>
+      <images>
+        <image>
+          <name>iso</name>
+          <extension>.iso</extension>
+          <qemu_options>-cdrom</qemu_options>
+        </image>
+      </images>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/packages-all.xml b/tests-source/parts/packages-all.xml
new file mode 100644
index 0000000..06c0ead
--- /dev/null
+++ b/tests-source/parts/packages-all.xml
@@ -0,0 +1,12 @@
+<autotesting>
+  <common>
+        <packages>
+        <package>gnome-desktop</package>
+        <package>kde-desktop</package>
+        <package>lxde-desktop</package>
+        <package>rescue</package>
+        <package>standard</package>
+        <package>xfce-desktop</package>
+      </packages>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/packages-xfce.xml b/tests-source/parts/packages-xfce.xml
new file mode 100644
index 0000000..cbc6a20
--- /dev/null
+++ b/tests-source/parts/packages-xfce.xml
@@ -0,0 +1,7 @@
+<autotesting>
+  <common>
+      <packages>
+        <package>xfce-desktop</package>
+      </packages>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/processor-amd64.xml b/tests-source/parts/processor-amd64.xml
new file mode 100644
index 0000000..c78f4d0
--- /dev/null
+++ b/tests-source/parts/processor-amd64.xml
@@ -0,0 +1,10 @@
+<autotesting>
+  <common>
+      <processors>
+        <processor>
+          <name>amd64</name>
+          <binary>qemu-system-x86_64</binary>
+        </processor>
+      </processors>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/processor-i386.xml b/tests-source/parts/processor-i386.xml
new file mode 100644
index 0000000..28c0cf9
--- /dev/null
+++ b/tests-source/parts/processor-i386.xml
@@ -0,0 +1,10 @@
+<autotesting>
+  <common>
+      <processors>
+        <processor>
+          <name>i386</name>
+          <binary>qemu-system-i386</binary>
+        </processor>
+      </processors>
+  </common>
+</autotesting>
diff --git a/tests-source/parts/processor-powerpc.xml b/tests-source/parts/processor-powerpc.xml
new file mode 100644
index 0000000..8aa9d88
--- /dev/null
+++ b/tests-source/parts/processor-powerpc.xml
@@ -0,0 +1,10 @@
+<autotesting>
+  <common>
+      <processors>
+        <processor>
+          <name>powerpc</name>
+          <binary>qemu-system-ppc</binary>
+        </processor>
+      </processors>
+  </common>
+</autotesting>
diff --git a/tests/local-test_morphix-lightgui.xml b/tests/local-test_debian-standard.xml
similarity index 57%
copy from tests/local-test_morphix-lightgui.xml
copy to tests/local-test_debian-standard.xml
index e318caf..4cb0b25 100644
--- a/tests/local-test_morphix-lightgui.xml
+++ b/tests/local-test_debian-standard.xml
@@ -1,26 +1,29 @@
 <autotesting>
   <tests>
     <test>
-      <download>http://127.0.0.1/autotesting/lightgui-basemod-2.6.23-2008-02-10_0018-latest.iso</download>
-      <title>Morphix LightGUI</title>
-      <description>Morphix. Daily build of LightGUI iso.</description>
-      <background>http://www.morphix.org/templates/MorphixORG/images/mambo_header.jpg</background>
+      <download>
+        <url>http://127.0.0.1/autotesting/debian-live-60alpha1-i386-standard.iso</url>
+        <md5sum>http://live.debian.net/cdimage/squeeze-builds/current/i386/iso-hybrid/MD5SUMS</md5sum>
+      </download>
+      <title>Debian Live</title>
+      <description>Debian Live. Daily build of i386 Standard iso.</description>
+      <background>http://live.debian.net/image.png</background>
       <frequency>daily</frequency>
       <qemu>
-        <xscreen>1024x768x24</xscreen>
+        <xscreen>800x600x24</xscreen>
         <binary>qemu</binary>
         <options>-cdrom</options>
         <!-- Time to pause before sending keys presses -->
         <pause>10</pause>
         <sendkeys>kp_enter</sendkeys>
         <!-- Time to run qmeu -->
-        <time>400</time>
+        <time>300</time>
       </qemu>
       <output>
         <!-- Number of test sets to keep -->
         <keep>4</keep>
         <root>/var/www/autotesting/</root>
-        <local>morphix/lightGUI/</local>
+        <local>tmp/debian-live/standard/</local>
         <video>autotesting.ogv</video>
         <screenshots>
           <final>final-screenshot.png</final>
diff --git a/twitter.xml b/twitter.xml
new file mode 100644
index 0000000..19ef928
--- /dev/null
+++ b/twitter.xml
@@ -0,0 +1,14 @@
+<autotesting>
+  <twitter>
+    <user>test</user>
+    <passw>test1</passw>
+    <hosting>
+      <!-- test results are stored according to the value of 
+            autotesting/tests/test/output/root.
+            The is the url to the path of root
+            e.g. if <root>/var/www/autotesting</root> then
+            <url>http://example.com/autotesting/</url> -->            
+      <url>http://autotesting.livecd.org/autotesting/</url>
+    </hosting>
+  </twitter>
+</autotesting>

-- 
debian-live/autotesting



More information about the debian-live-changes mailing list