bk commit into 5.1 tree (mats:1.2275)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-14 13:52:05+02:00, mats@romeo.(none) +2 -0
  Fixing unit test execution script to work with AIX 5.2 and OS X machines.
  These are using old version of the Test::Harness modules, so I resort
  to a safer way of running executable files.

  unittest/README.txt@stripped, 2006-08-14 13:52:00+02:00, mats@romeo.(none) +7 -0
    Adding reference to Doxygen-generated documentation on the intranet.

  unittest/unit.pl@stripped, 2006-08-14 13:52:00+02:00, mats@romeo.(none) +1 -25
    Using environment HARNESS_PERL_SWITCHES instead of a replacement
    straps

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/mytap-mysql-5.1-new-maint

--- 1.3/unittest/README.txt	2006-08-14 13:52:11 +02:00
+++ 1.4/unittest/README.txt	2006-08-14 13:52:12 +02:00
@@ -37,3 +37,10 @@
 Note, it's important to have "-t" at the end of the filename, otherwise the
 test won't be executed by 'make test' !
 
+
+Documentation
+-------------
+
+There is Doxygen-generated documentation available at:
+
+      https://intranet.mysql.com/~mkindahl/mytap/html/

--- 1.4/unittest/unit.pl	2006-08-14 13:52:12 +02:00
+++ 1.5/unittest/unit.pl	2006-08-14 13:52:12 +02:00
@@ -1,19 +1,5 @@
 #!/usr/bin/perl
 
-# Override _command_line in the standard Perl test harness to prevent
-# it from using "perl" to run the test scripts.
-package MySQL::Straps;
-
-use base qw(Test::Harness::Straps);
-
-use strict;
-
-sub _command_line {
-  return $_[1]
-}
-
-package main;
-
 use Test::Harness qw(&runtests $verbose);
 use File::Find;
 
@@ -37,9 +23,6 @@
 
 my $cmd = shift;
 
-# $Test::Harness::Verbose = 1;
-# $Test::Harness::Debug = 1;
-
 if (defined $cmd && exists $dispatch{$cmd}) {
     $dispatch{$cmd}->(@ARGV);
 } else {
@@ -95,14 +78,7 @@
     if (@files > 0) {
         # Removing the first './' from the file names
         foreach (@files) { s!^\./!! }
-
-        # Install the strap above instead of the default strap.  Since
-        # we are replacing the straps under the feet of Test::Harness,
-        # we need to do some basic initializations in the new straps.
-        $Test::Harness::Strap = MySQL::Straps->new;
-        $Test::Harness::Strap->{callback} = \&Test::Harness::strap_callback
-          if defined &Test::Harness::strap_callback;
-
+        $ENV{'HARNESS_PERL_SWITCHES'} .= q" -e 'exec @ARGV'";
         runtests @files;
     }
 }