[Bps-public-commit] Shipwright branch, master, updated. e0de50b68b071ad030af56a3494012bf8c80be3e

sunnavy at bestpractical.com sunnavy at bestpractical.com
Mon Aug 3 01:38:49 EDT 2009


The branch, master has been updated
       via  e0de50b68b071ad030af56a3494012bf8c80be3e (commit)
       via  72d017db32f9f189dd4f5b6503796e1aa0b591b3 (commit)
      from  c12b7bd9f794203eb7de3a14a3d202392f38161d (commit)

Summary of changes:
 lib/Shipwright/Test.pm |    2 ++
 t/71.script_cmds.t     |    6 +++---
 t/hello/fs.t           |    6 +++---
 t/hello/git.t          |    1 -
 4 files changed, 8 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 72d017db32f9f189dd4f5b6503796e1aa0b591b3
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 3 13:31:50 2009 +0800

    go on cleaning

diff --git a/t/71.script_cmds.t b/t/71.script_cmds.t
index f35eebc..4dabba5 100644
--- a/t/71.script_cmds.t
+++ b/t/71.script_cmds.t
@@ -12,7 +12,7 @@ else {
 use Shipwright;
 use Shipwright::Test;
 use File::Spec::Functions qw/catdir tmpdir/;
-use File::Path qw/rmtree/;
+use File::Path qw/remove_tree/;
 use Cwd qw/getcwd/;
 my $sw  = Shipwright::Test->shipwright_bin;
 my $cwd = getcwd;
@@ -342,8 +342,8 @@ qr/set mandatory flags with success\s+mandatory flags of man1 are build/,
                     @$item[ 1 .. $#$item ],
                 );
                 chdir $cwd;
-                rmtree($install_base);
-                rmtree($build_base);
+                remove_tree($install_base);
+                remove_tree($build_base);
             }
             else {
                 test_cmd(
diff --git a/t/hello/fs.t b/t/hello/fs.t
index abafee1..199b82d 100644
--- a/t/hello/fs.t
+++ b/t/hello/fs.t
@@ -6,7 +6,7 @@ use File::Temp qw/tempdir/;
 use File::Copy;
 use File::Copy::Recursive qw/rcopy/;
 use File::Spec::Functions qw/catfile catdir updir/;
-use File::Path qw/rmtree/;
+use File::Path qw/remove_tree/;
 use Cwd qw/getcwd abs_path/;
 use File::Slurp;
 
@@ -190,5 +190,5 @@ for (
 }
 
 chdir $cwd;
-rmtree( $build_base );
-rmtree( $install_base );
+remove_tree( $build_base );
+remove_tree( $install_base );
diff --git a/t/hello/git.t b/t/hello/git.t
index c1b9f03..ef7f024 100644
--- a/t/hello/git.t
+++ b/t/hello/git.t
@@ -6,7 +6,6 @@ use File::Temp qw/tempdir/;
 use File::Copy;
 use File::Copy::Recursive qw/rcopy/;
 use File::Spec::Functions qw/catfile catdir updir/;
-use File::Path qw/rmtree/;
 use Cwd qw/getcwd abs_path/;
 use File::Slurp;
 

commit e0de50b68b071ad030af56a3494012bf8c80be3e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 3 13:38:37 2009 +0800

    set SHIPWRIGHT_USER_ROOT for test

diff --git a/lib/Shipwright/Test.pm b/lib/Shipwright/Test.pm
index 7061925..eb4c62b 100644
--- a/lib/Shipwright/Test.pm
+++ b/lib/Shipwright/Test.pm
@@ -184,6 +184,8 @@ sub init {
     $ENV{'SHIPWRIGHT_SVK'} ||= 'svk';
     $ENV{'SHIPWRIGHT_SVN'} ||= 'svn';
     $ENV{'SHIPWRIGHT_GIT'} ||= 'git';
+    $ENV{'SHIPWRIGHT_USER_ROOT'} =
+      tempdir( 'shipwright_user_root_XXXXXX', CLEANUP => 1, TMPDIR => 1 );
 }
 
 =head2 shipwright_bin

-----------------------------------------------------------------------



More information about the Bps-public-commit mailing list