CVS update by matsl xemacs-builds/matsl/package_smoketest,
xemacs-smoketest.sh ...
xemacs-cvs at xemacs.org
xemacs-cvs at xemacs.org
Mon Dec 18 17:38:43 EST 2006
User: matsl
Date: 06/12/18 23:38:43
Modified: xemacs-builds/matsl/package_smoketest showlogs.pl
xemacs-smoketest.sh
Log:
Unused scripts updated to reflect status just before they were
replaced.
Revision Changes Path
1.2 +41 -22 XEmacs/xemacs-builds/matsl/package_smoketest/showlogs.pl
Index: showlogs.pl
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/matsl/package_smoketest/showlogs.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- showlogs.pl 2004/10/06 23:24:25 1.1
+++ showlogs.pl 2006/12/18 22:38:41 1.2
@@ -1,11 +1,9 @@
#!/usr/bin/perl
-# $Id: showlogs.pl,v 1.1 2004/10/06 23:24:25 matsl Exp $
-
my $some_dir="build/logs";
opendir(DIR, $some_dir) || die "can't opendir $some_dir: $!";
- at logs = reverse sort grep { /^.*1\.log\.tail$/ && -f "$some_dir/$_" } readdir(DIR);
+ at logs = reverse sort grep { /^.*21.4-mule\.log\.tail$/ && -f "$some_dir/$_" } readdir(DIR);
closedir DIR;
sub log2html {
@@ -17,21 +15,35 @@ sub log2html {
print "<tr align=\"center\">\n";
- if ($logname =~ /^(.*)_(.*)_(.*)-(\d)\.log\.tail/) {
- $date = "$1_$2";
- $buildtype = $3;
- $buildnum = $4;
+ if ($logname =~ /^(.*)_(.*)_(.*)\.log\.tail/) {
+ $date = "$1";
+ $buildtype = "$2";
+ $buildarch = "$3";
}
+ # print "There is a build: $date $buildtype $buildarch\n";
+
printf("<td align=\"center\">$date</td>\n");
- # printf("<td><a href=%s>%s</a></td>\n", $date . "_$buildtype-$buildnum.log", $date . "_$buildtype-$buildnum.log");
- # printf("<td><a href=%s>%s</a></td>\n", $date . "_$buildtype-$buildnum.log", $date . "_$buildtype-$buildnum.log");
- # printf("<td><a href=%s>%s</a></td>\n", $date . "_$buildtype-$buildnum.log", $date . "_$buildtype-$buildnum.log");
- # printf("<td><a href=%s>%s</a></td>\n", $date . "_$buildtype.log.tail", $date . "_$buildtype.log.tail");
-
- for ($bnum = 1; $bnum < 7; $bnum++) {
- my $log = "$date" . "_$buildtype-$bnum.log";
- my $macros = "$date" . "_macro_err_" . "$bnum.txt";
+
+ # There is only three builds ... but we show 4 as a reminder
+ for ($bnum = 1; $bnum <= 4; $bnum++) {
+ # Dirty hack. Replace with python ;-)
+ if ($bnum == 1) {
+ $buildarch = "21.4-mule";
+ } elsif ($bnum == 2) {
+ $buildarch = "21.5-mule";
+ } elsif ($bnum == 3) {
+ $buildarch = "21.4-nomule";
+ } elsif ($bnum == 4) {
+ $buildarch = "21.5-nomule";
+ }
+
+ my $log = "$date" . "_" . "$buildtype" . "_" . "$buildarch.log";
+ my $macros = "$date" . "_macro_err_" . "$buildarch.txt";
+
+ # print "The log: $dir/$log\n";
+ # print "The macros: $macros\n";
+
# print "LOG = $dir/$log\n";
if ( -f "$dir/$log" ) {
open(LOG, "tail -1 $dir/$log |");
@@ -40,7 +52,7 @@ sub log2html {
if( $line =~ /^Status = (.*)/) {
$status = $1;
if (!$ARGV[0]) {
- printf("<td class=\"%s\">%s<br><a href=%s>Full</a> | <a href=%s>Tail</a> | <a href=%s>Macros</a></td>\n",
+ printf("<td class=\"%s\">%s<br><a href=\"%s\">Full</a> | <a href=\"%s\">Tail</a> | <a href=\"%s\">Macros</a></td>\n",
$status==0?"buildok":"buildfail",
$status==0?"ok":"FAIL",
"$log",
@@ -54,7 +66,7 @@ sub log2html {
}
}
} else {
- printf("<td align=\"center\">No build</td>\n");
+ printf("<td class=\"buildfail\" align=\"center\">No build</td>\n");
}
}
@@ -66,6 +78,7 @@ sub log2html {
print <<MOO
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
+
<html>
<head>
<link rel="STYLESHEET" type="text/css" href="style.css">
@@ -78,21 +91,27 @@ print <<MOO
<a href="http://www.xemacs.org"> <img src="xemacs-smoke.jpg" alt="XEmacs -- Fire and smoke"></a>
</p>
<h1>XEmacs Package Smoketest</h1>
+
+ <!-- Produced by: \$Id: showlogs.pl,v 1.2 2006/12/18 22:38:41 matsl Exp $ -->
+
MOO
;
-open(F,"news");
-while (<F>) {
- print;
-}
+# Call python function for doing this.
+system("./report-urls");
-print " <table border=2 width=\"100%\"><tr><th>Builds</th><th>21.4 mule</th><th>21.5 mule</th><th>21.1 mule</th><th>21.4 NO mule</th><th>21.5 NO mule</th><th>21.1 NO mule</th>\n";
for(@logs) {
log2html("$some_dir", "$_");
}
print " </table>";
print " <p><a href=build-logs>Build history</a></p>\n";
+
+open(F,"news");
+while (<F>) {
+ print;
+}
+
printf(" <P>Updated: %s</p>\n", `date`);
print " </body>\n</html>\n";
1.2 +5 -8 XEmacs/xemacs-builds/matsl/package_smoketest/xemacs-smoketest.sh
Index: xemacs-smoketest.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/matsl/package_smoketest/xemacs-smoketest.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-smoketest.sh 2004/10/06 23:24:25 1.1
+++ xemacs-smoketest.sh 2006/12/18 22:38:41 1.2
@@ -1,11 +1,8 @@
#!/bin/sh
-#### Note: This the packages-smoketest.sh modified for the package
-#### smoketest.
-
## packages-smoketest.sh -- Script for smoketesting XEmacs package builds.
-## $Id: xemacs-smoketest.sh,v 1.1 2004/10/06 23:24:25 matsl Exp $
+## $Id: xemacs-smoketest.sh,v 1.2 2006/12/18 22:38:41 matsl Exp $
## Copyright (C) 2002 Ville Skyttä.
@@ -33,8 +30,8 @@
## sure you're using a dir dedicated to this script there.
# Setup PATHs for build
-export TEXMF=/home/matsl/work/smoketest/share/texmf
-PATH=$HOME/work/smoketest/bin:$HOME/work/smoketest/bin/i686-pc-linux-gnu:$PATH:/usr/X11R6/bin
+# PATH=$HOME/work/smoketest/bin:$PATH:/usr/X11R6/bin
+PATH=$PATH:/usr/X11R6/bin
export PATH
# The dir where we're doing the testing. Will be created if it doesn't exist.
@@ -51,7 +48,7 @@ COMPRESS=
MAKE="make"
# The XEmacs executables with which the smoketests are run.
-XEMACSEN="$HOME/work/smoketest/bin/xemacs-21.4.15 $HOME/work/smoketest/bin/xemacs-21.5-b17 $HOME/work/smoketest/bin/xemacs-21.1.14 $HOME/work/smoketest/nomule/bin/xemacs-21.4.15 $HOME/work/smoketest/nomule/bin/xemacs-21.5-b17 $HOME/work/smoketest/nomule/bin/xemacs-21.1.14"
+XEMACSEN="$HOME/work/smoketest/bin/xemacs-21.4.16 $HOME/work/smoketest/bin/xemacs-21.5-b19 $HOME/work/smoketest/nomule/bin/xemacs-21.4.16 $HOME/work/smoketest/nomule/bin/xemacs-21.5-b19"
# Global CVS options.
# CVS_OPTS="-q -z3 -d:pserver:cvs at cvs.xemacs.org:2401/pack/xemacscvs"
@@ -111,7 +108,7 @@ buildAll ()
echo "------ Packages build smoketest -- all from top level"
getInfo $XEMACS
echo "------ $MAKE $TOPLEVEL_TARGETS"
- $MAKE XEMACS=$XEMACS XEMACS_21_5=$XEMACS_21_5 BUILD_WITHOUT_MULE=$BUILD_WITHOUT_MULE $TOPLEVEL_TARGETS
+ $MAKE XEMACS_BINARY=$XEMACS XEMACS_21_5=$XEMACS_21_5 BUILD_WITHOUT_MULE=$BUILD_WITHOUT_MULE $TOPLEVEL_TARGETS
RETVAL=$?
echo "------ End of build -- all from top level"
return $RETVAL
@@ -141,7 +138,7 @@ buildOne ()
cleanUp ()
{
echo " Cleaning up..."
- $MAKE distclean >/dev/null 2>&1
+ $MAKE extraclean >/dev/null 2>&1
# [ -n "$1" ] && $MAKE -C $2 autoloads >/dev/null 2>&1
}
More information about the XEmacs-CVS
mailing list