r22260: Use single script for creating Samba 4 test environments. Add first test

that uses the member environment.
(This used to be commit 9e3142a1bb3f3b3e06ea1a54215474d88de4d44d)

1 files changed, 5 insertions, 2 deletions

diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index b891b4dc7b..cabc952fc3 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -140,15 +140,18 @@ sub provision_member($$$)
 	my ($self, $prefix, $dcvars) = @_;
 	my %ret = ();
 	print "PROVISIONING...";
-	open(IN, "$RealBin/mktestmember.sh $prefix $dcvars->{DOMAIN} $dcvars->{USERNAME} $dcvars->{PASSWORD}|") or die("Unable to setup");
+	open(IN, "SERVER_ROLE=\"member server\" $RealBin/mksamba4server.sh $prefix|") or die("Unable to setup");
 	while (<IN>) {
 		die ("Error parsing `$_'") unless (/^([A-Z0-9a-z_]+)=(.*)$/);
 		$ret{$1} = $2;
 	}
 	close(IN);
 
+	system("$self->{bindir}/net join $ret{CONFIGURATION} $dcvars->{DOMAIN} member -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}") or die("Join failed");
+
 	$ret{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo";
 	$ret{SMBD_TEST_LOG} = "$prefix/smbd_test.log";
+	print "$ret{DOMAIN}\n";
 	return \%ret;
 }
 
@@ -157,7 +160,7 @@ sub provision_dc($$)
 	my ($self, $prefix) = @_;
 	my %ret = ();
 	print "PROVISIONING...";
-	open(IN, "$RealBin/mktestdc.sh $prefix|") or die("Unable to setup");
+	open(IN, "$RealBin/mksamba4server.sh $prefix|") or die("Unable to setup");
 	while (<IN>) {
 		die ("Error parsing `$_'") unless (/^([A-Z0-9a-z_]+)=(.*)$/);
 		$ret{$1} = $2;