[Jifty-commit] r4571 - in jifty/trunk: lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Thu Nov 29 14:20:16 EST 2007


Author: alexmv
Date: Thu Nov 29 14:20:16 2007
New Revision: 4571

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Test.pm

Log:
 r25250 at zoq-fot-pik:  chmrr | 2007-11-29 14:19:09 -0500
  * Add in a hash of the path, so we can run the same test in parallel
    from different paths.


Modified: jifty/trunk/lib/Jifty/Test.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Test.pm	(original)
+++ jifty/trunk/lib/Jifty/Test.pm	Thu Nov 29 14:20:16 2007
@@ -13,7 +13,8 @@
 use File::Spec;
 use File::Temp;
 use Hash::Merge;
-use Cwd 'abs_path';
+use Digest::MD5 qw/md5_hex/;
+use Cwd qw/abs_path cwd/;
 
 =head1 NAME
 
@@ -374,16 +375,13 @@
 
 
 sub _testfile_to_dbname {
-    if ($ENV{JIFTY_FAST_TEST}) {
-        return 'fasttest';
-    }
-    else {
+    return 'fasttest' if $ENV{JIFTY_FAST_TEST};
     my $dbname = lc($0);
     $dbname =~ s/\.t$//;
-    $dbname =~ s/[-_\.\/\\]//g;
-    $dbname = substr($dbname,-32,32);	
+    $dbname =~ s/(\W|[_-])+//g;
+    $dbname .= substr(md5_hex(cwd()), 0, 8);
+    $dbname = substr($dbname,-32,32);
     return $dbname;
-    } 
 }
 
 =head2 make_server


More information about the Jifty-commit mailing list