svn commit: samba r22409 - in branches/SAMBA_4_0/source/script/tests: .

metze at samba.org metze at samba.org
Fri Apr 20 11:40:45 GMT 2007


Author: metze
Date: 2007-04-20 11:40:44 +0000 (Fri, 20 Apr 2007)
New Revision: 22409

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22409

Log:
try to fix selftest.pl on systems with old perl versions

metze
Modified:
   branches/SAMBA_4_0/source/script/tests/Samba3.pm
   branches/SAMBA_4_0/source/script/tests/Samba4.pm
   branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba3.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/Samba3.pm	2007-04-20 11:29:45 UTC (rev 22408)
+++ branches/SAMBA_4_0/source/script/tests/Samba3.pm	2007-04-20 11:40:44 UTC (rev 22409)
@@ -8,7 +8,6 @@
 use strict;
 use Cwd qw(abs_path);
 use FindBin qw($RealBin);
-use POSIX;
 
 sub binpath($$)
 {
@@ -203,12 +202,12 @@
 	## 
 	## create the test directory layout
 	##
-	mkdir($prefix_abs);
+	mkdir($prefix_abs, 0777);
 	print "CREATE TEST ENVIRONMENT IN '$prefix'...";
 	system("rm -rf $prefix_abs/*");
-	mkdir($_) foreach($privatedir,$libdir,$piddir,$lockdir,$logdir);
+	mkdir($_, 0777) foreach($privatedir,$libdir,$piddir,$lockdir,$logdir);
 	my $tmpdir = "$prefix_abs/tmp";
-	mkdir($tmpdir);
+	mkdir($tmpdir, 0777);
 	chmod 0777, $tmpdir;
 
 	open(CONF, ">$conffile") or die("Unable to open $conffile");

Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-20 11:29:45 UTC (rev 22408)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-20 11:40:44 UTC (rev 22409)
@@ -173,7 +173,7 @@
 {
 	my ($self, $ldapdir, $basedn, $root, $password, $privatedir, $configuration) = @_;
 
-	mkdir($ldapdir);
+	mkdir($ldapdir, 0777);
 
 	my $fedora_ds_inf = "$ldapdir/fedorads.inf";
 	my $fedora_ds_initial_ldif = "$ldapdir/fedorads-initial.ldif";
@@ -270,7 +270,7 @@
 	my $pidfile = "$ldapdir/slapd.pid";
 	my $modconf = "$ldapdir/modules.conf";
 
-	mkdir($_) foreach ($ldapdir, "$ldapdir/db", "$ldapdir/db/bdb-logs", 
+	mkdir($_, 0777) foreach ($ldapdir, "$ldapdir/db", "$ldapdir/db/bdb-logs", 
 		"$ldapdir/db/tmp");
 
 	open(CONF, ">$slapd_conf");
@@ -405,7 +405,7 @@
 	my $root = ($ENV{USER} or $ENV{LOGNAME} or `whoami`);
 	my $server = "localhost";
 	my $srcdir="$RealBin/../..";
-	-d $prefix or mkdir($prefix) or die("Unable to create $prefix");
+	-d $prefix or mkdir($prefix, 0777) or die("Unable to create $prefix");
 	my $prefix_abs = abs_path($prefix);
 	my $tmpdir = "$prefix_abs/tmp";
 	my $etcdir = "$prefix_abs/etc";
@@ -426,7 +426,7 @@
 	my $interfaces = "$ifaceipv4/8";
 
 	(system("rm -rf $prefix/*") == 0) or die("Unable to clean up");
-	mkdir($_) foreach ($privatedir, $etcdir, $piddir, $ncalrpcdir, $lockdir, 
+	mkdir($_, 0777) foreach ($privatedir, $etcdir, $piddir, $ncalrpcdir, $lockdir, 
 		$tmpdir);
 
 	open(CONFFILE, ">$conffile");

Modified: branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm	2007-04-20 11:29:45 UTC (rev 22408)
+++ branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm	2007-04-20 11:40:44 UTC (rev 22409)
@@ -21,7 +21,7 @@
 		if ( -d $dir ) {
 			unlink <$dir/*>;
 		} else {
-			mkdir($dir);
+			mkdir($dir, 0777);
 		}
 
 		if ($pcap) {
@@ -30,7 +30,7 @@
 			if ( -d $pcap_dir ) {
 				unlink <$pcap_dir/*>;
 			} else {
-				mkdir($pcap_dir);
+				mkdir($pcap_dir, 0777);
 			}
 		}
 	}

Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-20 11:29:45 UTC (rev 22408)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-20 11:40:44 UTC (rev 22409)
@@ -494,7 +494,7 @@
 die("using an empty prefix isn't allowed") unless $prefix ne "";
 
 #Ensure we have the test prefix around
-mkdir $prefix unless -d $prefix;
+mkdir($prefix, 0777) unless -d $prefix;
 
 my $prefix_abs = abs_path($prefix);
 my $srcdir_abs = abs_path($srcdir);
@@ -581,12 +581,12 @@
 {
 	my ($conffile, $vars) = @_;
 
-	mkdir "$prefix/client" unless -d "$prefix/client";
+	mkdir("$prefix/client", 0777) unless -d "$prefix/client";
 	
 	if ( -d "$prefix/client/private" ) {
 	        unlink <$prefix/client/private/*>;
 	} else {
-	        mkdir("$prefix/client/private");
+	        mkdir("$prefix/client/private", 0777);
 	}
 
 	open(CF, ">$conffile");



More information about the samba-cvs mailing list