[Bps-public-commit] r14448 - sd/trunk/t

[cwest at bestpractical.com]

Author: cwest
Date: Wed Jul 23 20:20:56 2008
New Revision: 14448

Modified:
   sd/trunk/t/sd-hm.t

Log:
Be smarter about no-Jifty testing

Modified: sd/trunk/t/sd-hm.t
==============================================================================
--- sd/trunk/t/sd-hm.t	(original)
+++ sd/trunk/t/sd-hm.t	Wed Jul 23 20:20:56 2008
@@ -3,18 +3,18 @@
 use strict;
 use Prophet::Test;
 use App::SD::Test;
-use Test::More;
 
 BEGIN {
-    unless ( $ENV{'JIFTY_APP_ROOT'} ) {
+    if ( $ENV{'JIFTY_APP_ROOT'} ) {
+        plan tests => 10;
+        require File::Temp;
+        $ENV{'PROPHET_REPO'} = $ENV{'SD_REPO'} = File::Temp::tempdir( CLEANUP => 0 ) . '/_svb';
+        warn $ENV{'PROPHET_REPO'};
+        eval "use Jifty";
+        push @INC, File::Spec->catdir( Jifty::Util->app_root, "lib" );
+    } else {
         plan skip_all => "You must define a JIFTY_APP_ROOT environment variable which points to your hiveminder source tree";
     }
-    plan tests => 10;
-    require File::Temp;
-    $ENV{'PROPHET_REPO'} = $ENV{'SD_REPO'} = File::Temp::tempdir( CLEANUP => 0 ) . '/_svb';
-    warn $ENV{'PROPHET_REPO'};
-    use Jifty;
-    push @INC, File::Spec->catdir( Jifty::Util->app_root, "lib" );
 }
 
 eval 'use BTDT::Test; 1;' or die "$@";