-# $Id: IRSpy.pm,v 1.5 2006-06-21 16:09:02 mike Exp $
+# $Id: IRSpy.pm,v 1.10 2006-07-21 11:50:17 mike Exp $
package ZOOM::IRSpy;
targets => undef, # filled in later
target2record => undef, # filled in later
pod => undef, # filled in later
+ tests => [], # stack of tests currently being executed
}, $class;
$this->log("irspy", "starting up with database '$dbname'");
my @targets = split /\s+/, $targetList;
my @qlist;
foreach my $target (@targets) {
- my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/);
- if (!defined $host) {
- $port = 210;
- ($host, $db) = ($target =~ /(.*?)\/(.*)/);
- my $new = "$host:$port/$db";
- $this->log("irspy_debug", "rewriting '$target' to '$new'");
- $target = $new;
+ my($host, $port, $db, $newtarget) = _parse_target_string($target);
+ if ($newtarget ne $target) {
+ $this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
+ $target = $newtarget; # This written through the ref
}
- die "invalid target string '$target'"
- if !defined $host;
push @qlist,
(qq[(host = "$host" and port = "$port" and path="$db")]);
}
}
+# Also used by ZOOM::IRSpy::Record
+sub _parse_target_string {
+ my($target) = @_;
+
+ my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/);
+ if (!defined $host) {
+ $port = 210;
+ ($host, $db) = ($target =~ /(.*?)\/(.*)/);
+ $target = "$host:$port/$db";
+ }
+ die "$0: invalid target string '$target'"
+ if !defined $host;
+
+ return ($host, $port, $db, $target);
+}
+
+
# There are two cases.
#
# 1. A specific set of targets is nominated on the command line.
my $this = shift();
my($tname) = @_;
+ die("$0: test-hierarchy loop detected: " .
+ join(" -> ", @{ $this->{tests} }, $tname))
+ if grep { $_ eq $tname } @{ $this->{tests} };
+
eval {
- require "ZOOM/IRSpy/Test/$tname.pm";
+ my $slashSeperatedTname = $tname;
+ $slashSeperatedTname =~ s/::/\//g;
+ require "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
}; if ($@) {
$this->log("warn", "can't load test '$tname': skipping",
$@ =~ /^Can.t locate/ ? () : " ($@)");
}
$this->log("irspy", "running test '$tname'");
+ push @{ $this->{tests} }, $tname;
my $test = "ZOOM::IRSpy::Test::$tname"->new($this);
- return $test->run();
+ my $res =$test->run();
+ pop @{ $this->{tests} };
+ return $res;
}
# Can be called with a Connection instead of a target-name
my $conn = $target;
$target = $conn->option("host");
- $this->log("irspy_debug", "record() resolved $conn to '$target'");
}
return $this->{target2record}->{lc($target)};