Merge lp:~johnemb/randgen/xml-report into lp:randgen

[John H. Embretsen]

Basic support for automatic test reporting. Extends the existing XML reporting functionality (module) with various fixes, adaptations to new version of the specified schema, and adds functionality for sending XML report files via SCP to a remote destination.

The functionality is working, but expect to see further improvements in the near future.

New options (to runall and gentest) added (subject to change):

 --testname=<name_of_test>
 --report-xml-tt (enable reporting to the TestTool reporting framework)
 --report-xml-tt-type=<type> (report transport type, current default is "scp")
 --report-xml-tt-dest=<destination> (where to send XML report, current default is set to some non-public user@host:path, tested internally).

To enable XML report delivery both options --xml-output=<filename> and --report-xml-tt must be set.

See https://blueprints.launchpad.net/randgen/+spec/xml-report-delivery

=== modified file 'gentest.pl'
--- gentest.pl	2010-03-13 15:32:59 +0000
+++ gentest.pl	2010-04-07 14:30:43 +0000
@@ -46,6 +46,7 @@
                             'gendata:s',
                             'grammar=s',
                             'redefine=s',
+                            'testname=s',
                             'threads=i',
                             'queries=s',
                             'duration=s',
@@ -54,12 +55,15 @@
                             'rpl_mode=s',
                             'validators:s@',
                             'reporters:s@',
+                            'report-xml-tt',
+                            'report-xml-tt-type=s',
+                            'report-xml-tt-dest=s',
                             'seed=s',
                             'mask=i',
                             'mask-level=i',
                             'rows=i',
                             'varchar-length=i',
-                            'xml_output=s',
+                            'xml-output=s',
                             'views',
                             'start-dirty',
                             'filter=s',
@@ -77,6 +81,7 @@
               'engine',
               'gendata',
               'redefine',
+              'testname',
               'threads',
               'queries',
               'duration',
@@ -85,6 +90,9 @@
               'rpl_mode',
               'validators',
               'reporters',
+              'report-xml-tt',
+              'report-xml-tt-type',
+              'report-xml-tt-dest',
               'seed',
               'mask',
               'mask-level',
@@ -138,7 +146,11 @@
         --views     : Pass --views to gendata-old.pl or gendata.pl
         --filter    : ......
         --start-dirty: Do not generate data (use existing database(s))
-        --xml-output: ......
+        --xml-output: Name of a file to which an XML report will be written if this option is set.
+        --report-xml-tt: Report test results in XML-format to the Test Tool (TT) reporting framework.
+        --report-xml-tt-type: Type of TT XML transport to use (e.g. scp)
+        --report-xml-tt-dest: Destination of TT XML report (e.g. user\@host:/path/to/location (for type scp))
+        --testname  : Name of test, used for reporting purposes.
         --valgrind  : ......
         --filter    : ......
         --help      : This help message

=== modified file 'lib/GenTest.pm'
--- lib/GenTest.pm	2010-03-04 13:51:59 +0000
+++ lib/GenTest.pm	2010-04-07 14:30:43 +0000
@@ -18,7 +18,7 @@
 package GenTest;
 use base 'Exporter';
 
-@EXPORT = ('say', 'sayFile', 'tmpdir', 'safe_exit', 'windows',
+@EXPORT = ('say', 'sayFile', 'tmpdir', 'safe_exit', 'windows', 'linux',
            'solaris', 'isoTimestamp', 'isoUTCTimestamp', 'rqg_debug');
 
 use strict;
@@ -123,6 +123,14 @@
 	}	
 }
 
+sub linux {
+	if ($^O eq 'linux') {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
 sub solaris {
 	if ($^O eq 'solaris') {
 		return 1;
@@ -136,7 +144,7 @@
 
 	my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = defined $datetime ? localtime($datetime) : localtime();
 	return sprintf("%04d-%02d-%02dT%02d:%02d:%02d", $year+1900, $mon+1 ,$mday ,$hour, $min, $sec);
-	
+
 }
 
 sub isoUTCTimestamp {

=== modified file 'lib/GenTest/App/GenTest.pm'
--- lib/GenTest/App/GenTest.pm	2010-04-06 13:29:11 +0000
+++ lib/GenTest/App/GenTest.pm	2010-04-07 14:30:43 +0000
@@ -24,6 +24,7 @@
 use strict;
 use Carp;
 use Data::Dumper;
+use File::Basename;
 
 use GenTest;
 use GenTest::Properties;
@@ -40,6 +41,7 @@
 use GenTest::XML::Report;
 use GenTest::XML::Test;
 use GenTest::XML::BuildInfo;
+use GenTest::XML::Transporter;
 use GenTest::Constants;
 use GenTest::Result;
 use GenTest::Validator;
@@ -234,8 +236,24 @@
             );
     }
     
+    # XML: 
+    #  Define test suite name for reporting purposes.
+    #  Until we support test suites and/or reports with multiple suites/tests,
+    #  we use the test name as test suite name, from config option "testname".
+    #  Default test name is the basename portion of the grammar file name.
+    #  If a grammar file is not given, the default is "rqg_no_name".
+    my $test_suite_name = $self->config->testname;
+    if (not defined $test_suite_name) {
+        if (defined $self->config->grammar) {
+            $test_suite_name = basename($self->config->grammar, '.yy');
+        } else {
+            $test_suite_name = "rqg_no_name";
+        }
+    }
+    
     my $test = GenTest::XML::Test->new(
-        id => Time::HiRes::time(),
+        id => time(),
+        name => $test_suite_name,  # NOTE: Consider changing to test (or test case) name when suites are supported.
         attributes => {
             engine => $self->config->engine,
             gendata => $self->config->gendata,
@@ -254,6 +272,7 @@
     
     my $report = GenTest::XML::Report->new(
         buildinfo => $buildinfo,
+        name => $test_suite_name,  # NOTE: name here refers to the name of the test suite or "test".
         tests => [ $test ]
         );
 
@@ -393,9 +412,26 @@
         $test->end($total_status == STATUS_OK ? "pass" : "fail");
         
         if (defined $self->config->property('xml-output')) {
-            open (XML , ">$self->config->property('xml-output')") or say("Unable to open $self->config->property('xml-output'): $!");
+            open (XML , '>'.$self->config->property('xml-output')) or carp("Unable to open ".$self->config->property('xml-output').": $!");
             print XML $report->xml();
             close XML;
+            say("XML report written to ". $self->config->property('xml-output'));
+        }
+
+        # XML Result reporting to Test Tool (TT).
+        # Currently both --xml-output=<filename> and --report-xml-tt must be
+        # set to trigger this.
+        if (defined $self->config->property('report-xml-tt')) {
+            my $xml_transporter = GenTest::XML::Transporter->new(
+                type => $self->config->property('report-xml-tt-type')
+            );
+            my $result = $xml_transporter->sendXML(
+                $self->config->property('xml-output'),
+                $self->config->property('report-xml-tt-dest')
+            );
+            if ($result != STATUS_OK) {
+                croak("Error from XML Transporter: $result");
+            }
         }
         
         if ($total_status == STATUS_OK) {

=== modified file 'lib/GenTest/XML/BuildInfo.pm'
--- lib/GenTest/XML/BuildInfo.pm	2010-02-10 12:47:45 +0000
+++ lib/GenTest/XML/BuildInfo.pm	2010-04-07 14:30:43 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2008, 2010 Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -24,107 +24,123 @@
 use GenTest;
 use DBI;
 
-use constant BUILDINFO_DSNS	=> 0;
-use constant BUILDINFO_SERVERS	=> 1;
+use constant BUILDINFO_DSNS     => 0;
+use constant BUILDINFO_SERVERS  => 1;
 
-use constant BUILDINFO_SERVER_VERSION	=> 0;
-use constant BUILDINFO_SERVER_PACKAGE	=> 1;
-use constant BUILDINFO_SERVER_BIT	=> 2;
-use constant BUILDINFO_SERVER_PATH	=> 3;
-use constant BUILDINFO_SERVER_VARIABLES	=> 4;
+use constant BUILDINFO_SERVER_VERSION   => 0;
+use constant BUILDINFO_SERVER_PACKAGE   => 1;
+use constant BUILDINFO_SERVER_BIT       => 2;
+use constant BUILDINFO_SERVER_PATH      => 3;
+use constant BUILDINFO_SERVER_VARIABLES => 4;
 
 sub new {
-	my $class = shift;
-
-	my $buildinfo = $class->SUPER::new({
-		dsns	=> BUILDINFO_DSNS
-	}, @_);
-
-	$buildinfo->[BUILDINFO_SERVERS] = [];
-
-	foreach my $id (0..$#{$buildinfo->[BUILDINFO_DSNS]}) {
-		my $dsn = $buildinfo->[BUILDINFO_DSNS]->[$id];
-		next if $dsn eq '';
-		my $dbh = DBI->connect($dsn);
-
-		my $server;
-
-		$server->[BUILDINFO_SERVER_VERSION] = $dbh->selectrow_array('SELECT @@version');
-		$server->[BUILDINFO_SERVER_PACKAGE] = $dbh->selectrow_array('SELECT @@version_comment');
-		$server->[BUILDINFO_SERVER_BIT] = $dbh->selectrow_array('SELECT @@version_compile_machine');
-		$server->[BUILDINFO_SERVER_PATH] = $dbh->selectrow_array('SELECT @@basedir');
-		$server->[BUILDINFO_SERVER_VARIABLES] = [];
-
-		my $sth = $dbh->prepare("SHOW VARIABLES");
-		$sth->execute();
-		while (my ($name, $value) = $sth->fetchrow_array()) {
-			push @{$server->[BUILDINFO_SERVER_VARIABLES]}, [ $name , $value ];
-		}
-		$sth->finish();
-
-		$dbh->disconnect();
-
-		$buildinfo->[BUILDINFO_SERVERS]->[$id] = $server;
-	}
-
-	return $buildinfo;
+    my $class = shift;
+
+    my $buildinfo = $class->SUPER::new({
+        dsns    => BUILDINFO_DSNS
+    }, @_);
+
+    $buildinfo->[BUILDINFO_SERVERS] = [];
+
+    foreach my $id (0..$#{$buildinfo->[BUILDINFO_DSNS]})
+    {
+        my $dsn = $buildinfo->[BUILDINFO_DSNS]->[$id];
+        next if $dsn eq '';
+        my $dbh = DBI->connect($dsn);
+
+        my $server;
+
+        # TODO: Add support for non-MySQL dsns.
+        $server->[BUILDINFO_SERVER_VERSION] = $dbh->selectrow_array('SELECT @@version');
+        $server->[BUILDINFO_SERVER_PACKAGE] = $dbh->selectrow_array('SELECT @@version_comment');
+        # According to the schema, bit must be "32" or "64".
+        #$server->[BUILDINFO_SERVER_BIT] = $dbh->selectrow_array('SELECT @@version_compile_machine');
+        $server->[BUILDINFO_SERVER_PATH] = $dbh->selectrow_array('SELECT @@basedir');
+        $server->[BUILDINFO_SERVER_VARIABLES] = [];
+
+        my $sth = $dbh->prepare("SHOW VARIABLES");
+        $sth->execute();
+        while (my ($name, $value) = $sth->fetchrow_array()) {
+            push @{$server->[BUILDINFO_SERVER_VARIABLES]}, [ $name , $value ];
+        }
+        $sth->finish();
+
+        $dbh->disconnect();
+
+        $buildinfo->[BUILDINFO_SERVERS]->[$id] = $server;
+    }
+
+    return $buildinfo;
 }
 
 sub xml {
-	require XML::Writer;
-
-	my $buildinfo = shift;
-	my $buildinfo_xml;
-
-	my $writer = XML::Writer->new(
-		OUTPUT		=> \$buildinfo_xml,
-	);
-
-	$writer->startTag('product');
-	$writer->dataElement('name','mysql');
-	$writer->startTag('builds');
-
-	foreach my $id (0..$#{$buildinfo->[BUILDINFO_DSNS]}) {
-		my $server = $buildinfo->[BUILDINFO_SERVERS]->[$id];
-		next if not defined $server;
-
-		$writer->startTag('build', id => $id);
-		$writer->dataElement('version', $server->[BUILDINFO_SERVER_VERSION]);
-		$writer->dataElement('package', $server->[BUILDINFO_SERVER_PACKAGE]);
-		$writer->dataElement('bit', $server->[BUILDINFO_SERVER_BIT]);
-		$writer->dataElement('path', $server->[BUILDINFO_SERVER_PATH]);
-		# <compile_options> 
-		$writer->endTag('build');
-	}
-
-	$writer->endTag('builds');
-
-	$writer->startTag('binaries');
-
-        foreach my $id (0..$#{$buildinfo->[BUILDINFO_DSNS]}) {
-		my $server = $buildinfo->[BUILDINFO_SERVERS]->[$id];
-		next if not defined $server;
-
-		$writer->startTag('binary');
-		$writer->dataElement('name', 'mysqld');
-		$writer->startTag('commandline_options');
-
-		foreach my $option (@{$server->[BUILDINFO_SERVER_VARIABLES]}) {
-			$writer->startTag('option');
-			$writer->dataElement('name', $option->[0]);
-			$writer->dataElement('value', $option->[1]);
-			$writer->endTag('option');
-		}
-
-		$writer->endTag('commandline_options');
-		$writer->endTag('binary');
-	}
-	
-	$writer->endTag('binaries');
-	$writer->endTag('product');
-	$writer->end();
-
-	return $buildinfo_xml;	
+    require XML::Writer;
+
+    my $buildinfo = shift;
+    my $buildinfo_xml;
+
+    my $writer = XML::Writer->new(
+        OUTPUT      => \$buildinfo_xml,
+    );
+
+    $writer->startTag('product');
+    $writer->dataElement('name','MySQL');
+    $writer->startTag('builds');
+
+    foreach my $id (0..$#{$buildinfo->[BUILDINFO_DSNS]})
+    {
+        my $server = $buildinfo->[BUILDINFO_SERVERS]->[$id];
+        next if not defined $server;
+
+        $writer->startTag('build', id => $id);
+        $writer->dataElement('version', $server->[BUILDINFO_SERVER_VERSION]);
+        $writer->dataElement('package', $server->[BUILDINFO_SERVER_PACKAGE]);
+        #$writer->dataElement('bit', $server->[BUILDINFO_SERVER_BIT]); # Must be 32 or 64
+        $writer->dataElement('path', $server->[BUILDINFO_SERVER_PATH]);
+        ## TODO (if applicable):
+        #<xsd:element name="tree" type="xsd:string" minOccurs="0" form="qualified"/>
+        #<xsd:element name="revision" type="xsd:string" minOccurs="0" form="qualified"/>
+        #<xsd:element name="tag" type="xsd:string" minOccurs="0" form="qualified"/>
+        #<xsd:element name="compile_options" type="cassiopeia:Options" minOccurs="0" form="qualified"/>
+        #<xsd:element name="commandline" type="xsd:string" minOccurs="0" form="qualified" />
+        #<xsd:element name="buildscript" minOccurs="0" type="xsd:string" form="qualified" />
+        $writer->endTag('build');
+    }
+
+
+    $writer->endTag('builds');
+
+    $writer->startTag('binaries'); # --> <software> = <program>
+
+    foreach my $id (0..$#{$buildinfo->[BUILDINFO_DSNS]})
+    {
+        my $server = $buildinfo->[BUILDINFO_SERVERS]->[$id];
+        next if not defined $server;
+
+        $writer->startTag('program');
+        $writer->dataElement('name', 'mysqld');
+        $writer->dataElement('type', 'database');
+        $writer->startTag('commandline_options');
+
+    # TODO: List actual commmand-line options (and config file options /
+    #       RQG-defaults?), not all server variables?
+        foreach my $option (@{$server->[BUILDINFO_SERVER_VARIABLES]})
+        {
+            $writer->startTag('option');
+            $writer->dataElement('name', $option->[0]);
+            $writer->dataElement('value', $option->[1]);
+            $writer->endTag('option');
+        }
+
+        $writer->endTag('commandline_options');
+        $writer->endTag('program');
+    }
+
+    $writer->endTag('binaries');
+    $writer->endTag('product');
+    $writer->end();
+
+    return $buildinfo_xml;
 }
 
 1;

=== modified file 'lib/GenTest/XML/Environment.pm'
--- lib/GenTest/XML/Environment.pm	2010-02-10 12:47:45 +0000
+++ lib/GenTest/XML/Environment.pm	2010-04-07 14:30:43 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2008, 2010 Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -21,57 +21,342 @@
 @ISA = qw(GenTest);
 
 use strict;
+use Carp;
+use File::Spec;
 use GenTest;
-
+use Net::Domain qw(hostfqdn);
+
+# Global variables keeping environment info
+our $hostname = Net::Domain->hostfqdn();
+our $arch;
+our $kernel;
+our $bit;
+our $cpu;
+our $memory;
+#our $disk;
+our $role = 'server';
+our $locale;
+our $encoding;
+our $timezone;
+our $osType;
+our $osVer;
+our $osRev;
+our $osPatch;
+our $osBit;
+
+
+our $DEBUG=0;
 
 sub new {
-	my $class = shift;
-
-	my $environment = $class->SUPER::new({
-	}, @_);
-
-	return $environment;
+    my $class = shift;
+
+    my $environment = $class->SUPER::new({
+    }, @_);
+
+    return $environment;
 }
 
 sub xml {
-	require XML::Writer;
-
-	my $environment = shift;
-	my $environment_xml;
-
-	my $writer = XML::Writer->new(
-		OUTPUT		=> \$environment_xml,
-	);
-
-	$writer->startTag('environments');
-	$writer->startTag('environment', 'id' => 0);
-	$writer->startTag('hosts');
-	$writer->startTag('host');
-
-	$writer->dataElement('name', `hostname`);
-	$writer->dataElement('arch', $^O);
-	$writer->dataElement('role', 'server');
-
-	# <os>
-
-	# <software>
-
-	$writer->startTag('software');
-	$writer->startTag('program');
-	$writer->dataElement('name', 'perl');
-	$writer->dataElement('version', $^V);
-	$writer->dataElement('path', $^X);
-	$writer->endTag('program');
-	$writer->endTag('software');
-
-	$writer->endTag('host');
-	$writer->endTag('hosts');
-	$writer->endTag('environment');
-	$writer->endTag('environments');
-
-	$writer->end();
-
-	return $environment_xml;	
+    require XML::Writer;
+
+    # Obtain environmental info from host.
+    # In separate function because lots of logic is needed to parse various
+    # information based on the OS.
+    getInfo();
+
+    my $environment = shift;
+    my $environment_xml;
+
+    my $writer = XML::Writer->new(
+        OUTPUT      => \$environment_xml,
+    );
+
+    $writer->startTag('environments');
+    $writer->startTag('environment', 'id' => 0);
+    $writer->startTag('hosts');
+    $writer->startTag('host');
+
+    # Some elements may be empty either because
+    #  a) we don't know that piece of information
+    #  b) values are fetched from a database of test hosts
+    $writer->dataElement('name', $hostname);
+    $writer->dataElement('arch', $arch);
+    $writer->dataElement('kernel', $kernel);
+    $writer->dataElement('bit', $bit) if defined $bit;
+    $writer->dataElement('cpu', $cpu);
+    $writer->dataElement('memory', $memory);
+    $writer->dataElement('disk', '');
+    $writer->dataElement('role', $role);
+    $writer->dataElement('locale', $locale);
+    $writer->dataElement('encoding', $encoding);
+    $writer->dataElement('timezone', $timezone);
+
+    #
+    # <software> ...
+    #
+    $writer->startTag('software');
+
+    # <os>
+    $writer->startTag('program');
+    $writer->dataElement('name', $osType);
+    $writer->dataElement('type', 'os');
+    $writer->dataElement('version', $osVer);
+    #$writer->dataElement('patch', $osPatch); # not in XML schema
+    $writer->dataElement('bit', $osBit) if defined $osBit;
+    $writer->endTag('program');
+
+    # <program> perl
+    $writer->startTag('program');
+    $writer->dataElement('name', 'perl');
+    $writer->dataElement('type', 'perl');
+    #$writer->dataElement('version', $^V); # Solaris yields: Code point \u0005 is not a valid character in XML at lib/GenTest/XML/Environment.pm line 45
+    $writer->dataElement('version', $]);
+    $writer->dataElement('path', $^X);
+    $writer->endTag('program');
+
+    # <program> harness
+    $writer->startTag('program');
+    $writer->dataElement('name', 'Random Query Generator');
+    $writer->dataElement('type', 'harness');
+    my $rqg_path = File::Spec->rel2abs();   # assuming cwd is the randgen dir
+    $writer->dataElement('path', $rqg_path);
+    ## TODO (if applicable):
+    #<xsd:element name="version" type="xsd:string" minOccurs="0" maxOccurs="1" form="qualified"/>
+    #<xsd:element name="revision" type="xsd:int" minOccurs="0" form="qualified"/>
+    #<xsd:element name="commandline_options" type="cassiopeia:Options" minOccurs="0" form="qualified"/>
+    #<xsd:element name="commandline" minOccurs="0" type="xsd:string" form="qualified" /> # alternative to the above
+    $writer->endTag('program');
+    
+    $writer->endTag('software');
+
+    $writer->endTag('host');
+    $writer->endTag('hosts');
+    $writer->endTag('environment');
+    $writer->endTag('environments');
+
+    $writer->end();
+
+    return $environment_xml;
+}
+
+sub getInfo()
+{
+
+    # lets see what OS type we have
+    if (linux())
+    {
+        
+        # Get the CPU info
+        $cpu = trim(`cat /proc/cpuinfo | grep -i "model name" | head -n 1 | cut -b 14-`);
+        my $numOfP = trim(`cat /proc/cpuinfo | grep processor |wc -l`);
+        $cpu ="$numOfP"."x"."$cpu";
+
+        #try to get OS Information
+        if (-e "/etc/SuSE-release"){$osVer=`cat /etc/SuSE-release  |head -n 1`;}
+        elsif (-e "/etc/redhat-release"){$osVer=`cat /etc/redhat-release  |head -n 1`;}
+        elsif (-e "/etc/debian_version"){$osVer=`cat /etc/debian_version  |head -n 1`;}
+        else {$osVer="linux-unknown";}
+        $osVer=trim($osVer);
+        if (-e "/etc/SuSE-release"){$osPatch=`cat /etc/SuSE-release  |tail -n 1`;}
+        elsif (-e "/etc/redhat-release"){$osPatch=`cat /etc/redhat-release  |tail -n 1`;}
+        elsif (-e "/etc/debian_version"){$osPatch=`cat /etc/debian_version  |tail -n 1`;}
+        else {$osPatch="unknown";}
+        (my $trash, $osPatch) = split(/=/,$osPatch);
+        $osType="Linux";
+        $arch=trim(`uname -m`);
+        # We assume something like "x86_64" from 'uname -m'. Get bit info from that.
+        ($trash, $bit) = split(/_/,$arch);
+        # If nothing after '_' (or no '_' at all), assume 32-bit.
+        $bit = "32" if length($bit) < 1;
+        #$bit = undef if length($bit) < 1;
+        $osBit = $bit;  # treat $osBit as $bit for now...
+
+        $kernel=trim(`uname -r`);
+
+        #Memory
+        $memory = trim(`cat /proc/meminfo | grep -i memtotal`);
+        $memory =~ s/MemTotal: //;
+        ($memory, $trash) =  split(/k/,$memory);
+        $memory = trim(`cat /proc/meminfo |grep -i memtotal`);
+        $memory =~ /MemTotal:\s*(\d+)/;
+        $memory = sprintf("%.2f",($1/1024000))."GB";
+
+        #locale
+        if (defined ($locale=`locale |grep LC_CTYPE| cut -b 10-`))
+        {
+            ($locale,$encoding) = split(/\./,$locale);
+        }
+        else
+        {
+            $locale   = "UNKNOWN";
+            $encoding = "UNKNOWN";
+        }
+
+        #TimeZone
+        $timezone = trim(`date +%Z`);
+    }
+    elsif(solaris())
+    {
+        
+        # Get the CPU info
+        my $tmpVar = `/usr/sbin/psrinfo -v | grep -i "operates" | head -1`;
+        ($cpu, my $speed) = split(/processor operates at/,$tmpVar);
+        $cpu =~ s/The//;
+        $speed =~ s/MHz//;
+        $cpu = trim($cpu);
+        $speed = trim($speed);
+        if ($speed => 1000)
+        {
+            $speed = $speed/1000;
+            $speed = "$speed"."GHz";
+        }
+        else
+        {
+            $speed = "$speed"."MHz";
+        }
+
+        my $numOfP = `/usr/sbin/psrinfo -v | grep -i "operates" |wc -l`;
+        $numOfP = trim($numOfP);
+        $cpu ="$numOfP"."x"."$cpu"."$speed";
+
+        #try to get OS Information
+        ($osType,$osVer,$arch) = split (/ /, trim(`uname -srp`));
+        # use of uname -m is discouraged (man pages), so use isainfo instead
+        $kernel = `isainfo -k`;
+        $osBit = `isainfo -b`;
+        my $trash; # variable functioning as /dev/null
+        ($trash, $trash, my $osPatch1, my $osPatch2, $trash) = split(/ /, trim(`cat /etc/release | head -1`));
+        my $osPatch3 = `uname -v`;
+        $osPatch = $osPatch1.' '.$osPatch2.' '.$osPatch3;
+        $osPatch = trim($osPatch);
+
+        #Memory
+        $memory = `/usr/sbin/prtconf | grep Memory`;
+        $memory =~ s/Memory size://;
+        $memory =~ s/Megabytes//;
+        $memory = trim($memory);
+        $memory = $memory/1024;
+        ($memory, my $trash) = split(/\./,$memory);
+        $memory = "$memory"."GB";
+
+        #locale
+        if (defined ($locale=`locale |grep LC_CTYPE| cut -b 10-`))
+        {
+            ($locale,$encoding) = split(/\./,$locale);
+        }
+        else
+        {
+            $locale   = "UNKNOWN";
+            $encoding = "UNKNOWN";
+        }
+
+        #TimeZone
+        $timezone = trim(`date +%Z`);
+    }
+    elsif(windows())
+    {
+        #$hostName = `hostname`;
+        my @tmpData;
+        if ($^O eq 'cygwin')
+        {
+            # Assuming cygwin on Windows at this point
+            @tmpData = `cmd /c systeminfo 2>&1`;
+        }
+        else
+        {
+            # Assuming Windows at this point
+            @tmpData = `systeminfo 2>&1`;
+        }
+
+        if ($? != 0)
+        {
+            carp "systeminfo command failed with: $?";
+            $cpu        = "UNKNOWN";
+            $osType     = "UNKNOWN";
+            $osVer      = "UNKNOWN";
+            $arch       = "UNKNOWN";
+            $kernel     = "UNKNOWN";
+            $memory     = "UNKNOWN";
+            $locale     = "UNKNOWN";
+            $timezone   = "UNKNOWN";
+        }
+        else
+        {
+            $kernel = "UNKOWN";
+            my $cpuFlag = 0;
+            # Time to get busy and grab what we need.
+            foreach my $line (@tmpData)
+            {
+                if ($cpuFlag == 1)
+                {
+                    (my $numP, $cpu) = split(/\:/,$line);
+                    $numP = trim($numP);
+                    (my $trash, $numP) = split(/\[/,$numP);
+                    ($numP, $trash) = split(/\]/,$numP);
+                    $cpu = "$numP"."$cpu";
+                    $cpu = trim($cpu);
+                    $cpuFlag=0;
+                }
+                elsif ($line =~ /OS Name:\s+(.*?)\s*$/)
+                {
+                    $osType = $1;
+                }
+                elsif ($line =~ /^OS Version:\s+(.*?)\s*$/)
+                {
+                    $osVer = $1;
+                }
+                elsif ($line =~ /System type:\s/i)
+                {
+                    (my $trash, $arch) = split(/\:/,$line);
+                    ($arch,$trash) = split(/\-/,$arch);
+                    $arch = trim($arch);
+                }
+                elsif ($line =~ /^Processor/)
+                {
+                    $cpuFlag = 1;
+                    next;
+                }
+                elsif ($line =~ /^Total Physical Memory:\s+(.*?)\s*$/)
+                {
+                    $memory = $1;
+                }
+                elsif ($line =~ /Locale:/)
+                {
+                    (my $trash, $locale) = split(/\:/,$line);
+                    ($locale, $trash) = split(/\;/,$locale);
+                    $locale = trim($locale);
+                }
+                elsif ($line =~ /Time Zone:\s+(.*?)\s*$/)
+                {
+                    $timezone = $1;
+                }
+            }
+        }
+    }
+    else
+    {
+        confess "\n\nUnable to figure out OS!!\n\n";
+    }
+
+    if ($DEBUG)
+    {
+        print "cpu      = $cpu\n";
+        print "os       =  $osType\n";
+        print "OS ver   = $osVer\n";
+        print "Arch     = $arch\n";
+        print "Kernel   = $kernel\n";
+        print "memory   = $memory\n";
+        print "locale   = $locale\n";
+        print "Timezone = $timezone\n";
+    }
+}
+
+sub trim($)
+{
+    my $string = shift;
+    $string =~ s/^\s+//;
+    $string =~ s/\s+$//;
+    return $string;
 }
 
 1;

=== modified file 'lib/GenTest/XML/Report.pm'
--- lib/GenTest/XML/Report.pm	2010-03-04 13:51:59 +0000
+++ lib/GenTest/XML/Report.pm	2010-04-07 14:30:43 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2008, 2010 Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -30,10 +30,11 @@
 # test result XML report. Not all of them will be used
 #
 
-use constant XMLREPORT_DATE			=> 0;
-use constant XMLREPORT_BUILDINFO		=> 1;
-use constant XMLREPORT_TESTS			=> 2;
-use constant XMLREPORT_ENVIRONMENT		=> 3;
+use constant XMLREPORT_DATE             => 0;
+use constant XMLREPORT_BUILDINFO        => 1;
+use constant XMLREPORT_TESTS            => 2;
+use constant XMLREPORT_ENVIRONMENT      => 3;
+use constant XMLREPORT_NAME             => 4;
 
 1;
 
@@ -44,62 +45,74 @@
 		environment	=> XMLREPORT_ENVIRONMENT,
 		date		=> XMLREPORT_DATE,
 		buildinfo	=> XMLREPORT_BUILDINFO,
-		tests		=> XMLREPORT_TESTS
+		tests		=> XMLREPORT_TESTS,
+        name        => XMLREPORT_NAME
 	}, @_);
 
-	$report->[XMLREPORT_DATE] = isoUTCTimestamp() if not defined $report->[XMLREPORT_DATE];
+	$report->[XMLREPORT_DATE] = isoTimestamp() if not defined $report->[XMLREPORT_DATE];
 	$report->[XMLREPORT_ENVIRONMENT] = GenTest::XML::Environment->new() if not defined  $report->[XMLREPORT_ENVIRONMENT];
 
 	return $report;
 }
 
 sub xml {
-	my $report = shift;
-
-	require XML::Writer;
-
-	my $report_xml;
-
-	my $writer = XML::Writer->new(
-		OUTPUT		=> \$report_xml,
-		UNSAFE		=> 1
-	);
-
-	$writer->xmlDecl('ISO-8859-1');
-	$writer->startTag('report',
-		'xmlns'			=> "http://clustra.norway.sun.com/intraweb/organization/qa/cassiopeia",
-		'xmlns:xsi'		=> "http://www.w3.org/2001/XMLSchema-instance",
-		'xsi:schemaLocation'	=> "http://clustra.norway.sun.com/intraweb/organization/qa/cassiopeia http://clustra.norway.sun.com/intraweb/organization/qa/cassiopeia/cassiopeia-testresult.xsd"
-	);
-	
-	$writer->dataElement('date', $report->[XMLREPORT_DATE]);
-	$writer->dataElement('version', 1);
-	$writer->dataElement('operator', $<);
-
-	$writer->raw($report->[XMLREPORT_BUILDINFO]->xml()) if defined $report->[XMLREPORT_BUILDINFO];
-	$writer->raw($report->[XMLREPORT_ENVIRONMENT]->xml()) if defined $report->[XMLREPORT_BUILDINFO];
-
-	$writer->startTag('testsuites');
-	$writer->startTag('testsuite', id => 0);
-	$writer->dataElement('name', 'Random Query Generator');
-	$writer->dataElement('environment_id', 0);
-	$writer->dataElement('starttime', $report->[XMLREPORT_DATE]);
-	$writer->dataElement('endtime', isoUTCTimestamp());
-	$writer->dataElement('description', 'http://forge.mysql.com/wiki/RQG');
-	$writer->startTag('tests');
-
-	foreach my $test (@{$report->[XMLREPORT_TESTS]}) {
-		$writer->raw($test->xml());
-	}
-
-	$writer->endTag('tests');
-	$writer->endTag('testsuite');
-	$writer->endTag('testsuites');
-	$writer->endTag('report');
-
-	$writer->end();
-
-	return $report_xml;
+    my $report = shift;
+
+    require XML::Writer;
+
+    my $report_xml;
+
+    my $writer = XML::Writer->new(
+        OUTPUT      => \$report_xml,
+        UNSAFE      => 1    # required for use of 'raw()'
+    );
+
+    $writer->xmlDecl('ISO-8859-1');
+    $writer->startTag('report',
+        'xmlns'                 => "http://clustra.norway.sun.com/intraweb/organization/qa/cassiopeia",
+        'xmlns:xsi'             => "http://www.w3.org/2001/XMLSchema-instance",
+        'xsi:schemaLocation'    => "http://clustra.norway.sun.com/intraweb/organization/qa/cassiopeia http://clustra.norway.sun.com/intraweb/organization/qa/cassiopeia/testresult-schema-1-2.xsd",
+        'version'               => "1.2"
+    );
+
+    $writer->dataElement('date', $report->[XMLREPORT_DATE]);
+    if (linux() || solaris())
+    {
+        $writer->dataElement('operator', $ENV{'LOGNAME'});
+    }
+    else
+    {
+        $writer->dataElement('operator', $ENV{'USERNAME'});
+    }
+
+    $writer->raw($report->[XMLREPORT_ENVIRONMENT]->xml()) if defined $report->[XMLREPORT_BUILDINFO];
+    $writer->raw($report->[XMLREPORT_BUILDINFO]->xml()) if defined $report->[XMLREPORT_BUILDINFO];
+
+    $writer->startTag('testsuites');
+    $writer->startTag('testsuite', id => 0);
+    $writer->dataElement('name', $report->[XMLREPORT_NAME]);
+    $writer->dataElement('environment_id', 0);
+    $writer->dataElement('starttime', $report->[XMLREPORT_DATE]);
+    $writer->dataElement('endtime', isoTimestamp());
+    $writer->dataElement('description', 'http://forge.mysql.com/wiki/RQG');
+    # TODO (if applicable):
+    # test-suite specific descriptions (once we have defined testsuites)?
+    #<xsd:element name="logdir" type="xsd:string" minOccurs="0" form="qualified"/>
+    #<xsd:element name="attributes" type="cassiopeia:Attributes" minOccurs="0" form="qualified"/> # pairs of (name, value)
+    $writer->startTag('tests');
+
+    foreach my $test (@{$report->[XMLREPORT_TESTS]}) {
+        $writer->raw($test->xml());
+    }
+
+    $writer->endTag('tests');
+    $writer->endTag('testsuite');
+    $writer->endTag('testsuites');
+    $writer->endTag('report');
+
+    $writer->end();
+
+    return $report_xml;
 }
 
 1;

=== modified file 'lib/GenTest/XML/Test.pm'
--- lib/GenTest/XML/Test.pm	2010-03-04 13:51:59 +0000
+++ lib/GenTest/XML/Test.pm	2010-04-07 14:30:43 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2008, 2010 Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -28,101 +28,106 @@
 # test result XML report. Not all of them will be used
 #
 
-use constant TEST_ID			=> 0;
-use constant TEST_NAME			=> 1;
-use constant TEST_ENVIRONMENT_ID	=> 2;
-use constant TEST_STARTTIME		=> 3;
-use constant TEST_ENDTIME		=> 4;
-use constant TEST_LOGDIR		=> 5;
-use constant TEST_RESULT		=> 6;
-use constant TEST_DESCRIPTION		=> 7;
-use constant TEST_ATTRIBUTES		=> 8;	
-use constant TEST_INCIDENTS		=> 9;
+use constant TEST_ID                => 0;
+use constant TEST_NAME              => 1;
+use constant TEST_ENVIRONMENT_ID    => 2;
+use constant TEST_STARTTIME         => 3;
+use constant TEST_ENDTIME           => 4;
+use constant TEST_LOGDIR            => 5;
+use constant TEST_RESULT            => 6;
+use constant TEST_DESCRIPTION       => 7;
+use constant TEST_ATTRIBUTES        => 8;   
+use constant TEST_INCIDENTS         => 9;
 
 1;
 
 sub new {
-	my $class = shift;
-
-	my $test = $class->SUPER::new({
-		id		=> TEST_ID,
-		name		=> TEST_NAME,
-		environment_id	=> TEST_ENVIRONMENT_ID,
-		starttime	=> TEST_STARTTIME,
-		endtime		=> TEST_ENDTIME,
-		logdir		=> TEST_LOGDIR,
-		result		=> TEST_RESULT,
-		description	=> TEST_DESCRIPTION,
-		attributes	=> TEST_ATTRIBUTES,
-		incidents	=> TEST_INCIDENTS
-	}, @_);
-
-	$test->[TEST_STARTTIME] = isoUTCTimestamp() if not defined $test->[TEST_STARTTIME];
-	$test->[TEST_ENVIRONMENT_ID] = 0 if not defined $test->[TEST_ENVIRONMENT_ID];
-
-	return $test;
+    my $class = shift;
+
+    my $test = $class->SUPER::new({
+        id              => TEST_ID,
+        name            => TEST_NAME,
+        environment_id  => TEST_ENVIRONMENT_ID,
+        starttime       => TEST_STARTTIME,
+        endtime         => TEST_ENDTIME,
+        logdir          => TEST_LOGDIR,
+        result          => TEST_RESULT,
+        description     => TEST_DESCRIPTION,
+        attributes      => TEST_ATTRIBUTES,
+        incidents       => TEST_INCIDENTS
+    }, @_);
+
+    $test->[TEST_STARTTIME] = isoTimestamp() if not defined $test->[TEST_STARTTIME];
+    $test->[TEST_ENVIRONMENT_ID] = 0 if not defined $test->[TEST_ENVIRONMENT_ID];
+
+    return $test;
 }
 
 sub end {
-	my ($test, $result) = @_;
-	$test->[TEST_ENDTIME] = isoUTCTimestamp();	
-	$test->[TEST_RESULT] = $result;
+    my ($test, $result) = @_;
+    $test->[TEST_ENDTIME] = isoTimestamp();
+    $test->[TEST_RESULT] = $result;
 }
 
 sub xml {
-	require XML::Writer;
-
-	my $test = shift;
-
-	$test->end() if not defined $test->[TEST_ENDTIME];
-
-	my $test_xml;
-	my $writer = XML::Writer->new(
-		OUTPUT		=> \$test_xml,
-		UNSAFE		=> 1
-	);
-
-	$writer->startTag('test', id => $test->[TEST_ID]);
-
-	$writer->dataElement('name',		$test->[TEST_NAME]);
-	$writer->dataElement('environment_id',	$test->[TEST_ENVIRONMENT_ID]);
-        $writer->dataElement('starttime',		$test->[TEST_STARTTIME]);
-        $writer->dataElement('endtime',		$test->[TEST_ENDTIME]);
-	$writer->dataElement('logdir',		$test->[TEST_LOGDIR]);
-	$writer->dataElement('result',		$test->[TEST_RESULT]);
-	$writer->dataElement('description',		$test->[TEST_DESCRIPTION]);
-	
-	if (defined $test->[TEST_ATTRIBUTES]) {
-		$writer->startTag('attributes');
-		while (my ($name, $value) = each %{$test->[TEST_ATTRIBUTES]}) {
-			$writer->emptyTag('attribute', 'name' => $name, 'value' => $value);
-		}
-		$writer->endTag('attributes');
-	}
-
-	if (defined $test->[TEST_INCIDENTS]) {
-		$writer->startTag('incidents');
-		foreach my $incident (@{$test->[TEST_INCIDENTS]}) {
-			$writer->raw($incident->xml());
-		}
-		$writer->endTag('incidents');
-	}
-
-	$writer->endTag('test');
-
-	$writer->end();
-	
-	return $test_xml;
+    require XML::Writer;
+
+    my $test = shift;
+
+    $test->end() if not defined $test->[TEST_ENDTIME];
+
+    my $test_xml;
+    my $writer = XML::Writer->new(
+        OUTPUT      => \$test_xml,
+        UNSAFE      => 1
+    );
+
+    $writer->startTag('test', id => $test->[TEST_ID]);
+
+    $writer->dataElement('name',            $test->[TEST_NAME] ? $test->[TEST_NAME] : "NO_NAME");
+    $writer->dataElement('environment_id',  $test->[TEST_ENVIRONMENT_ID]);
+    $writer->dataElement('starttime',       $test->[TEST_STARTTIME]);
+    $writer->dataElement('endtime',         $test->[TEST_ENDTIME]);
+    $writer->dataElement('logdir',          $test->[TEST_LOGDIR]);
+    $writer->dataElement('result',          $test->[TEST_RESULT]);
+    $writer->dataElement('description',     $test->[TEST_DESCRIPTION]);
+
+    if (defined $test->[TEST_ATTRIBUTES]) {
+        $writer->startTag('attributes');
+        while (my ($name, $value) = each %{$test->[TEST_ATTRIBUTES]}) {
+            $writer->startTag('attribute');
+            $writer->dataElement('name',    $name);
+            $writer->dataElement('value',    $value);
+            $writer->endTag('attribute');
+        }
+        $writer->endTag('attributes');
+    }
+
+    if (defined $test->[TEST_INCIDENTS]) {
+        $writer->startTag('incidents');
+        foreach my $incident (@{$test->[TEST_INCIDENTS]}) {
+            $writer->raw($incident->xml());
+        }
+        $writer->endTag('incidents');
+    }
+
+    # TODO: <metrics> (name, value, unit, attributes, timestamp)
+
+    $writer->endTag('test');
+
+    $writer->end();
+
+    return $test_xml;
 }
 
 sub setId {
-	$_[0]->[TEST_ID] = $_[1];
+    $_[0]->[TEST_ID] = $_[1];
 }
 
 sub addIncident {
-	my ($test, $incident) = @_;
-	$test->[TEST_INCIDENTS] = [] if not defined $test->[TEST_INCIDENTS];
-	push @{$test->[TEST_INCIDENTS]}, $incident;
+    my ($test, $incident) = @_;
+    $test->[TEST_INCIDENTS] = [] if not defined $test->[TEST_INCIDENTS];
+    push @{$test->[TEST_INCIDENTS]}, $incident;
 }
 
 1;

=== added file 'lib/GenTest/XML/Transporter.pm'
--- lib/GenTest/XML/Transporter.pm	1970-01-01 00:00:00 +0000
+++ lib/GenTest/XML/Transporter.pm	2010-04-07 14:30:43 +0000
@@ -0,0 +1,189 @@
+# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+# Use is subject to license terms.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+# USA
+
+package GenTest::XML::Transporter;
+
+require Exporter;
+@ISA = qw(GenTest);
+
+#@EXPORT = ('XMLTRANSPORT_TYPE_SCP', 'XMLTRANSPORT_TYPE_MYSQL');
+
+use strict;
+use GenTest;
+use GenTest::Constants;
+use GenTest::Properties;
+
+
+use constant XMLTRANSPORT_TYPE              => 0;  # which transport type to use
+use constant XMLTRANSPORT_TYPE_MYSQL        => 1;  # db connections
+use constant XMLTRANSPORT_TYPE_SCP          => 2;  # secure copy
+use constant XMLTRANSPORT_TYPES             => 3;  # collection of types
+
+# Defaults:
+use constant XML_DEFAULT_TRANSPORT_TYPE     => XMLTRANSPORT_TYPE_SCP;
+use constant XML_MYSQL_DEFAULT_DSN          => 
+    'dbi:mysql:host=myhost:port=3306:user=xmldrop:password=test;database=test';
+use constant XML_SCP_DEFAULT_USER           => 'qauser';
+use constant XML_SCP_DEFAULT_HOST           => 'regin.norway.sun.com';
+use constant XML_SCP_DEFAULT_DEST_PATH      => '/raid/xml_results/TestTool/xml/';
+
+1;  # so the require or use succeeds
+
+#
+# Use this class for transporting XML reports to a given destination.
+#
+# Usage example (using default settings):
+#
+#   use GenTest::XML::Transporter;
+#   my $xml_transporter = GenTest::XML::Transporter->new(
+#       type => undef)
+#   );
+#   my $result = $xml_transporter->sendXML($xmlFileName);
+#   if ($result != STATUS_OK) {
+#       croak("Error from XML Transporter: $result");
+#   }
+#
+#
+sub new {
+	my $class = shift;
+
+	my $self = $class->SUPER::new({
+        type        => XMLTRANSPORT_TYPE
+	}, @_);
+
+    # Figure out transport type, which may be set as string value on
+    # command-line, or elsewhere. Use default if not set.
+    if (not defined $self->[XMLTRANSPORT_TYPE]) {
+        $self->[XMLTRANSPORT_TYPE] = XML_DEFAULT_TRANSPORT_TYPE;
+        say('XML Transport: Using default settings');
+    } elsif ($self->[XMLTRANSPORT_TYPE] =~ m{scp}io) {
+        # string match for "scp" (case insensitive)
+        $self->[XMLTRANSPORT_TYPE] = XMLTRANSPORT_TYPE_SCP;
+    } elsif ($self->[XMLTRANSPORT_TYPE] =~ m{mysql}io) {
+        # string match for "mysql" (case insensitive)
+        $self->[XMLTRANSPORT_TYPE] = XMLTRANSPORT_TYPE_MYSQL;
+    }
+
+    #${$self}[XMLTRANSPORT_TYPES] = ();
+
+    return $self;
+}
+
+
+#
+# Returns the type of transport mechanism this object represents.
+#
+sub type {
+    my $self = shift;
+    if (defined $self->[XMLTRANSPORT_TYPE]) {
+        return $self->[XMLTRANSPORT_TYPE];
+    } else {
+        return XML_DEFAULT_TRANSPORT_TYPE;
+    }
+}
+
+#
+# Constructs a default destination for the SCP transport type.
+# Suitable for use in an scp command-line such as:
+#    scp myfile <defaultScpDestination>
+# where <defaultScpDestination> is <user>@<host>:<path>.
+#
+sub defaultScpDestination {
+    my $self = shift;
+    return XML_SCP_DEFAULT_USER.'@'.XML_SCP_DEFAULT_HOST.
+            ':'.XML_SCP_DEFAULT_DEST_PATH;
+}
+
+
+#
+# Sends XML data to a destination.
+# The transport mechanism to use (e.g. file copy, database insert, ftp, etc.)
+# and destination is determined by the "type" argument to the object's
+# constructor.
+#
+# Arguments:
+#   arg1: xml  - The xml data file name. TODO: Support XML as string?
+#   arg2: dest - Destination for xml report. Defaults are used if omitted.
+#
+sub sendXML {
+    my ($self, $xml, $dest) = @_;
+
+    if ($self->type == XMLTRANSPORT_TYPE_MYSQL) {
+        say("XML Transport type: MySQL database connection");
+        $dest = XML_MYSQL_DEFAULT_DSN if not defined $dest;
+        return $self->mysql($xml, $dest);
+    } elsif ($self->type == XMLTRANSPORT_TYPE_SCP) {
+        say("XML Transport type: SCP");
+        $dest = $self->defaultScpDestination if not defined $dest;
+        return $self->scp($xml, $dest);
+    } else {
+        say("[ERROR] XML transport type '".$self->type."' not supported.");
+        return STATUS_ENVIRONMENT_FAILURE;
+    }
+
+
+    
+}
+
+#
+# Sends the XML contents of file $xml to $dest.
+# If $dest is not defined, a default MySQL dsn will be used.
+#
+# TODO: - Support argument as string (real XML contents) instead of file name.
+#       - Support non-default destination.
+#
+sub mysql() {
+    my ($self, $xml, $dest) = @_;
+
+    # TODO:
+    # 1. Establish dbh / connect
+    # 2. Execute query
+    # 3. Check for errors
+    # 4. Return appropriate status.
+    say("MySQL XML transport not implemented yet");
+    return STATUS_WONT_HANDLE;
+}
+
+#
+# Sends the file $xml by SCP (secure file copy) to $dest.
+#
+sub scp {
+    my ($self, $xml, $dest) = @_;
+
+    # For now, we assume $xml is a file name
+    # TODO: Support XML as string as well? Create temporary file?
+    my $xmlfile = $xml;
+
+    my $cmd;
+    if (windows()) {
+        $cmd = 'pscp.exe -q '.$xmlfile.' '.$dest;
+    } else {
+        $cmd = 'scp '.$xmlfile.' '.$dest;
+    }
+
+    say("SCP command is: ".$cmd);
+
+    # TODO: The scp command is interactive if keys and hosts are not set up.
+    #       This may cause hangs in automated environments. Find a way to
+    #       always run non-interactively, or kill the command after a timeout.
+    my $result == system($cmd);
+    if ($result != STATUS_OK) {
+        warn('XML Transport: scp failed. Command was: '.$cmd);
+    }
+
+    return $result >> 8;
+}

=== modified file 'runall.pl'
--- runall.pl	2010-03-19 12:25:07 +0000
+++ runall.pl	2010-04-07 14:30:43 +0000
@@ -56,7 +56,8 @@
     $engine, $help, $debug, $validators, $reporters, $grammar_file,
     $redefine_file, $seed, $mask, $mask_level, $mem, $rows,
     $varchar_len, $xml_output, $valgrind, $views, $start_dirty,
-    $filter, $build_thread);
+    $filter, $build_thread, $testname, $report_xml_tt, $report_xml_tt_type,
+    $report_xml_tt_dest);
 
 my $threads = my $default_threads = 10;
 my $queries = my $default_queries = 1000;
@@ -85,6 +86,9 @@
 	'debug' => \$debug,
 	'validators:s' => \$validators,
 	'reporters:s' => \$reporters,
+	'report-xml-tt' => \$report_xml_tt,
+	'report-xml-tt-type=s' => \$report_xml_tt_type,
+	'report-xml-tt-dest=s' => \$report_xml_tt_dest,
 	'gendata:s' => \$gendata,
 	'seed=s' => \$seed,
 	'mask=i' => \$mask,
@@ -97,7 +101,8 @@
 	'views'		=> \$views,
 	'start-dirty'	=> \$start_dirty,
 	'filter=s'	=> \$filter,
-    'mtr-build-thread=i' => \$build_thread
+    'mtr-build-thread=i' => \$build_thread,
+    'testname=s' => \$testname
 );
 
 if (!$opt_result || $help || $basedirs[0] eq '' || not defined $grammar_file) {
@@ -333,9 +338,13 @@
 push @gentest_options, "--views" if defined $views;
 push @gentest_options, "--varchar-length=$varchar_len" if defined $varchar_len;
 push @gentest_options, "--xml-output=$xml_output" if defined $xml_output;
+push @gentest_options, "--report-xml-tt" if defined $report_xml_tt;
+push @gentest_options, "--report-xml-tt-type=$report_xml_tt_type" if defined $report_xml_tt_type;
+push @gentest_options, "--report-xml-tt-dest=$report_xml_tt_dest" if defined $report_xml_tt_dest;
 push @gentest_options, "--debug" if defined $debug;
 push @gentest_options, "--filter=$filter" if defined $filter;
 push @gentest_options, "--valgrind" if defined $valgrind;
+push @gentest_options, "--testname=$testname" if defined $testname;
 
 # Push the number of "worker" threads into the environment.
 # lib/GenTest/Generator/FromGrammar.pm will generate a corresponding grammar element.
@@ -443,7 +452,11 @@
     --mask-level: Grammar mask level. Passed to gentest.pl
     --rows      : No of rows. Passed to gentest.pl
     --varchar-length: length of strings. passed to gentest.pl
-    --xml-outputs: Passed to gentest.pl
+    --xml-output: Passed to gentest.pl
+    --report-xml-tt: Passed to gentest.pl
+    --report-xml-tt-type: Passed to gentest.pl
+    --report-xml-tt-dest: Passed to gentest.pl
+    --testname  : Name of test, used for reporting purposes.
     --views     : Generate views. Passed to gentest.pl
     --valgrind  : Passed to gentest.pl
     --filter    : Passed to gentest.pl