CVS update by matsl xemacs-builds/matsl/package_smoketest, showlogs.py ...

xemacs-cvs at xemacs.org xemacs-cvs at xemacs.org
Mon Oct 29 19:47:30 EDT 2007


  User: matsl   
  Date: 07/10/30 00:47:30

  Modified:    xemacs-builds/matsl/package_smoketest MANIFEST buildall.pl
                        showlogs.py xemacs-smoketest.py
  Added:       xemacs-builds/matsl/package_smoketest ChangeLog
                        xemacsBinBuilds.py
Log:
Updated due to html problem with index page. Spotted by Ville Skyttä.

Revision  Changes    Path
1.4       +4 -1      XEmacs/xemacs-builds/matsl/package_smoketest/MANIFEST

Index: MANIFEST
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/matsl/package_smoketest/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- MANIFEST	2006/12/18 22:47:29	1.3
+++ MANIFEST	2007/10/29 23:47:27	1.4
@@ -3,7 +3,9 @@ buildall.pl             - Controls the b
 xemacs-smoketest.py     - Performs all the builds.
 showlogs.py             - Generates the webpage.
 checkBuild.sh           - Simple minded guard for killing hung xemacs processes.
-report-urls		- Produce html for the table head links
+
+---DATA----
+xemacsBinBuilds.py      - The URLs to the xemacs binaries build reports.
 
 --- EXECUTION ---
 crontab                 - Crontab entries for running the smoketest.
@@ -11,3 +13,4 @@ crontab                 - Crontab entrie
 --- OLD - NOT USED ---
 xemacs-smoketest.sh     - Performs all the builds. Replaced by xemacs-smoketest.py.
 showlogs.pl             - Generates the webpage. Replaced by showlogs.py.
+report-urls		- Produce html for the table head links



1.3       +2 -1      XEmacs/xemacs-builds/matsl/package_smoketest/buildall.pl

Index: buildall.pl
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/matsl/package_smoketest/buildall.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- buildall.pl	2006/12/18 22:39:28	1.2
+++ buildall.pl	2007/10/29 23:47:27	1.3
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# $Id: buildall.pl,v 1.3 2007/10/29 23:47:27 matsl Exp $
 
 # use this time for all time stamps so that they remain the same all over
 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time);
@@ -111,7 +112,7 @@ system "find build/logs -name '*.tgz' -m
 system "./showlogs.py > build/logs/index.html";
 
 # Make mail
-system "./showlogs.pl 1 > build/logs/nologs.html";
+# system "./showlogs.pl 1 > build/logs/nologs.html";
 
 close(LOG);
 flock(LOG, LOCK_UN);



1.2       +14 -3     XEmacs/xemacs-builds/matsl/package_smoketest/showlogs.py

Index: showlogs.py
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/matsl/package_smoketest/showlogs.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- showlogs.py	2006/12/18 22:39:28	1.1
+++ showlogs.py	2007/10/29 23:47:27	1.2
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# $Id: showlogs.py,v 1.2 2007/10/29 23:47:27 matsl Exp $
 
 # Generate The XEmacs Package Smoketest Report
 
@@ -7,6 +8,8 @@ import os
 import re
 import time
 
+from xemacsBinBuilds import urls
+
 # Output
 IP = None
 
@@ -117,11 +120,19 @@ print >> IP, """<!DOCTYPE HTML PUBLIC "-
     </p>
     <h1>XEmacs Package Smoketest</h1>
 
-    <!-- Produced by:  \$Id: showlogs.py,v 1.1 2006/12/18 22:39:28 matsl Exp $ -->
+    <!-- Produced by:  \$Id: showlogs.py,v 1.2 2007/10/29 23:47:27 matsl Exp $ -->
 """
     
-# Call python function for doing this.
-os.system("./report-urls")
+print >> IP, "<table border=2 width=\"100%\"><tr><th>Builds</th>" + \
+      "<th><a href=" + urls['21.4-mule'] + ">21.4 mule</a></th>" + \
+      "<th><a href=" + urls['21.5-mule'] + ">21.5 mule</a></th>" + \
+      "<th><a href=" + urls['21.4-nomule'] + ">21.4 NO mule</a></th>" + \
+      "<th><a href=" + urls['21.5-nomule'] + ">21.5 NO mule</a></th>" + \
+      "\n"
+
+## Disabled builds
+## "<th><a href=" + urls['21.1-mule'] + ">21.1 mule</a></th>" + \
+## "<th><a href=" + urls['21.1-nomule'] + ">21.1 NO mule</a></th>\n" + \
 
 # Generate table one row at a time ...
 rows=[]



1.2       +6 -11     XEmacs/xemacs-builds/matsl/package_smoketest/xemacs-smoketest.py

Index: xemacs-smoketest.py
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/matsl/package_smoketest/xemacs-smoketest.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-smoketest.py	2006/12/18 22:39:29	1.1
+++ xemacs-smoketest.py	2007/10/29 23:47:27	1.2
@@ -1,9 +1,9 @@
 #!/usr/bin/env python  
 # -*- coding: iso-8859-1 -*-
 
-## packages-smoketest.sh -- Script for smoketesting XEmacs package builds.
+## xemacs-smoketest.py -- Script for smoketesting XEmacs package builds.
 
-## $Id: xemacs-smoketest.py,v 1.1 2006/12/18 22:39:29 matsl Exp $
+## $Id: xemacs-smoketest.py,v 1.2 2007/10/29 23:47:27 matsl Exp $
 
 ## This file is part of XEmacs
 
@@ -39,13 +39,10 @@ os.environ['PATH'] += ':/usr/bin/X11'
 
 # The XEmacs executables with which the smoketests are run.
 BINARIES = { 
-	'21.4-mule' : { 'mule' : 1, 'bin' : 'bin/xemacs-21.4.19' },
-	'21.4-nomule' : { 'mule' : 0, 'bin' : 'nomule/bin/xemacs-21.4.19' },
-	'21.5-mule' : { 'mule' : 1, 'bin' : 'bin/xemacs-21.5-b27' },
-
-# disabled
-#	'21.5-nomule' : { 'mule' : 0, 'bin' : 'nomule/bin/xemacs-21.5-b27' },
-
+	'21.4-mule' : { 'mule' : 1, 'bin' : 'bin/xemacs-21.4.21' },
+	'21.4-nomule' : { 'mule' : 0, 'bin' : 'nomule/bin/xemacs-21.4.21' },
+	'21.5-mule' : { 'mule' : 1, 'bin' : 'bin/xemacs-21.5-b28' },
+	'21.5-nomule' : { 'mule' : 0, 'bin' : 'nomule/bin/xemacs-21.5-b28' },
     }
 		
 TOPLEVEL_TARGETS = 'autoloads all install'
@@ -174,8 +171,6 @@ def mailReport(b):
             f.write('ok')
         f.write('\n')
     f.write("""
-     Remember that the 21.5 nomule build is disabled at the moment.
-     
 For details check "http://labb.contactor.se/~matsl/smoketest/logs"
 -- 
 This is generated by the XEmacs Package Smoketest.



1.1                  XEmacs/xemacs-builds/matsl/package_smoketest/ChangeLog

Index: ChangeLog
===================================================================
2007-10-30  Mats Lidell  <matsl at xemacs.org>

	* MANIFEST: Updated.

	* buildall.pl: Disabled old page generation without links to the
	build logs. It was never in use.

	* showlogs.py: Generate a better html-page. Earlier versions were
	terribly bogus (but worked anyway!?). Thanks to Ville Skyttä for
	telling me about it.
 
	* xemacsBinBuilds.py: Created.

	* xemacs-smoketest.py: Synced with version in use.



1.1                  XEmacs/xemacs-builds/matsl/package_smoketest/xemacsBinBuilds.py

Index: xemacsBinBuilds.py
===================================================================
#!/usr/bin/python

urls = {
	'21.4-mule' : 'http://calypso.tux.org/pipermail/xemacs-buildreports/2007-May/000087.html',
	'21.5-mule' : 'http://calypso.tux.org/pipermail/xemacs-buildreports/2007-August/000133.html',
	'21.1-mule' : 'http://list-archive.xemacs.org/xemacs-build-reports/200411/msg00030.html',
	'21.4-nomule' :'http://calypso.tux.org/pipermail/xemacs-buildreports/2007-May/000088.html',
	'21.5-nomule' : 'http://calypso.tux.org/pipermail/xemacs-buildreports/2007-August/000132.html',
	'21.1-nomule' : 'http://list-archive.xemacs.org/xemacs-build-reports/200411/msg00031.html'
	}





More information about the XEmacs-CVS mailing list