[Koha-cvs] CVS: koha buildrelease,1.1.2.25,1.1.2.26 testKoha.pl,1.1.2.9,1.1.2.10

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv22442

Modified Files:
      Tag: rel-1-2
        buildrelease testKoha.pl 
Log Message:
buildrelease now puts the test scripts in $intranetdir/scripts/t/


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/buildrelease,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -C2 -r1.1.2.25 -r1.1.2.26
*** buildrelease        28 Oct 2002 22:59:46 -0000      1.1.2.25
--- buildrelease        29 Oct 2002 20:22:32 -0000      1.1.2.26
***************
*** 311,320 ****
  system("rm -f $rootdir/intranet-cgi/database.mysql");
  system("rm -f $rootdir/intranet-cgi/installer-lite.pl");
- # FIXME: The following two lines look suspicious
- #system("rm -f $rootdir/intranet-cgi/koha-1.2.0.tar.gz");
- #system("rm -f $rootdir/intranet-cgi/rel-1-2");
- system("rm -f $rootdir/intranet-cgi/testKoha.pl");
  system("rm -rf $rootdir/intranet-cgi/html-template");
! system("rm -rf $rootdir/intranet-cgi/t");
  
  # Set all .pl scripts executable
--- 311,319 ----
  system("rm -f $rootdir/intranet-cgi/database.mysql");
  system("rm -f $rootdir/intranet-cgi/installer-lite.pl");
  system("rm -rf $rootdir/intranet-cgi/html-template");
! 
! # Move test scripts to scripts dir
! system("mv $rootdir/intranet-cgi/testKoha.pl $rootdir/scripts");
! system("mv $rootdir/intranet-cgi/t $rootdir/scripts");
  
  # Set all .pl scripts executable

Index: testKoha.pl
===================================================================
RCS file: /cvsroot/koha/koha/testKoha.pl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -r1.1.2.9 -r1.1.2.10
*** testKoha.pl 29 Oct 2002 19:47:57 -0000      1.1.2.9
--- testKoha.pl 29 Oct 2002 20:22:38 -0000      1.1.2.10
***************
*** 3,6 ****
--- 3,15 ----
  # $Id$
  
+ BEGIN {
+     my $intranetdir=`grep intranetdir /etc/koha.conf`;
+     chomp $intranetdir;
+     $intranetdir=~s/\s*intranetdir\s*=\s*//i;
+     $::modulesdir=$intranetdir."/modules";
+ }
+ 
+ use lib $::modulesdir;
+ 
  use strict;
  use Test::Harness;
***************
*** 25,28 ****
--- 34,40 ----
  
  # $Log$
+ # Revision 1.1.2.10  2002/10/29 20:22:38  tonnesen
+ # buildrelease now puts the test scripts in $intranetdir/scripts/t/
+ #
  # Revision 1.1.2.9  2002/10/29 19:47:57  tonnesen
  # New test script for circulation module.