Removing debugging.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy.pm

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 15d1124..83d417c 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.37 2006-10-26 13:39:13 sondberg Exp $
+# $Id: IRSpy.pm,v 1.40 2006-10-26 18:02:59 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -85,7 +85,7 @@ sub new {
        targets => undef,       # filled in later
        connections => undef,   # filled in later
         libxml => $libxml,
-        irspy_to_zeerex_style => $xslt->parse_stylesheet($xsl_doc),
+        irspy_to_zeerex_style => $irspy_to_zeerex_style,
        tests => [],            # stack of tests currently being executed
     }, $class;
     $this->log("irspy", "starting up with database '$dbname'");
@@ -309,7 +309,7 @@ sub check {
 
     $tname = "Main" if !defined $tname;
     $this->{tree} = $this->_gather_tests($tname)
-       or die "No tests defined";
+       or die "No tests defined for '$tname'";
     #$this->{tree}->print(0);
     my $nskipped = 0;
 
@@ -460,11 +460,22 @@ sub _gather_tests {
        join(" -> ", @ancestors, $tname))
        if grep { $_ eq $tname } @ancestors;
 
+    my $slashSeperatedTname = $tname;
+    $slashSeperatedTname =~ s/::/\//g;
+    my $fullName = "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
+
     eval {
-       my $slashSeperatedTname = $tname;
-       $slashSeperatedTname =~ s/::/\//g;
-       require "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
+       ### This next line shouldn't be necessary, as we should
+       #   already be running in an environment where the test
+       #   modules are available -- otherwise, how did _this_ module
+       #   get loaded?  But it seems that for reasons I don't
+       #   understand we do sometimes (not always!) need this when
+       #   running under Apache.
+       use lib '/usr/local/src/cvs/irspy/lib';
+       require $fullName;
+       $this->log("irspy", "successfully required '$fullName'");
     }; if ($@) {
+       $this->log("irspy", "couldn't require '$fullName': $@");
        $this->log("warn", "can't load test '$tname': skipping",
                   $@ =~ /^Can.t locate/ ? () : " ($@)");
        return undef;