[Openinteract-commits] CVS: SPOPS Changes,1.80,1.81 Makefile.PL,1.13,1.14

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/SPOPS
In directory usw-pr-cvs1:/tmp/cvs-serv11836

Modified Files:
	Changes Makefile.PL 
Log Message:
ensure that the UUID tests don't get run if Data::UUID is not installed


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/Changes,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** Changes	2001/12/31 05:34:04	1.80
--- Changes	2001/12/31 16:10:36	1.81
***************
*** 1,4 ****
--- 1,18 ----
  Revision history for Perl extension SPOPS.
  
+ 0.56
+ 
+ Individual:
+ 
+    * Makefile.PL:
+ 
+      - Check to see whether Data::UUID is installed. (Thanks to brian
+      moseley <bc...@ma...> for pointing out the test failure.)
+ 
+    * t/03_uuid_key.t:
+ 
+      - Check the build configuration to see if the test should run
+ 
+ 
  0.55  Mon Dec 31 00:49:15 EST 2001
  

Index: Makefile.PL
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/Makefile.PL,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.PL	2001/12/15 19:18:51	1.13
--- Makefile.PL	2001/12/31 16:10:36	1.14
***************
*** 45,49 ****
      my ( $dbi_test, $dbi_driver, $dbi_dsn, $dbi_user, $dbi_password ) = check_dbi();
      my ( $ldap_test, $ldap_host, $ldap_port, $ldap_base_dn, $ldap_bind_dn, $ldap_password ) = check_ldap();
!     my ( $gdbm_test ) = check_gdbm();     
  
      if ( $dbi_test eq 'n' and $ldap_test eq 'n' and $gdbm_test eq 'n' ) {
--- 45,50 ----
      my ( $dbi_test, $dbi_driver, $dbi_dsn, $dbi_user, $dbi_password ) = check_dbi();
      my ( $ldap_test, $ldap_host, $ldap_port, $ldap_base_dn, $ldap_bind_dn, $ldap_password ) = check_ldap();
!     my ( $gdbm_test ) = check_gdbm();
!     my ( $uuid_test ) = check_uuid();
  
      if ( $dbi_test eq 'n' and $ldap_test eq 'n' and $gdbm_test eq 'n' ) {
***************
*** 66,69 ****
--- 67,71 ----
  LDAP_bind_password: $ldap_password
  GDBM_test:     $gdbm_test
+ UUID_test:     $uuid_test
  $EXTRA_INFO
  CONFIG
***************
*** 228,234 ****
          print "You don't appear to have GDBM_File installed, skipping GDBM tests.\n";
          return ( 'n' );
!     } 
!     my $gdbm_test = lc get_response( "Would you like to run tests using GDBM? (Y/n)\n", 'Y' );
!     print "\n";
!     return ( $gdbm_test );
  }
--- 230,246 ----
          print "You don't appear to have GDBM_File installed, skipping GDBM tests.\n";
          return ( 'n' );
!     }
!     return 'y';
! }
! 
! # Find out about UUID test
! 
! sub check_uuid {
!     eval { require Data::UUID };
!     if ( $@ ) {
!         print "You don't appear to have Data::UUID installed,\n",
!               "skipping UUID key generation tests\n";
!         return( 'n' );
!     }
!     return 'y';
  }