Author: jelmer Date: 2007-03-07 02:11:40 +0000 (Wed, 07 Mar 2007) New Revision: 21733
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21733 Log: Merge testenv back into core selftest.pl Removed: branches/SAMBA_4_0/source/script/tests/testenv.pl Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/main.mk branches/SAMBA_4_0/source/script/tests/selftest.pl Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:merge ...skipped... Modified: branches/SAMBA_4_0/source/main.mk =================================================================== --- branches/SAMBA_4_0/source/main.mk 2007-03-07 01:46:02 UTC (rev 21732) +++ branches/SAMBA_4_0/source/main.mk 2007-03-07 02:11:40 UTC (rev 21733) @@ -304,7 +304,7 @@ $(SELFTEST) --quick --socket-wrapper --immediate $(TESTS) testenv: all libraries - $(srcdir)/script/tests/testenv.pl + $(SELFTEST) --socket-wrapper --testenv valgrindtest: valgrindtest-quick @@ -321,7 +321,7 @@ valgrindtest-env: all libraries SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ - $(srcdir)/script/tests/testenv.pl + $(SELFTEST) --socket-wrapper --testenv gdbtest: gdbtest-quick Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl =================================================================== --- branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-03-07 01:46:02 UTC (rev 21732) +++ branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-03-07 02:11:40 UTC (rev 21733) @@ -130,6 +130,7 @@ my $opt_expected_failures = undef; my $opt_skip = undef; my $opt_verbose = 0; +my $opt_testenv = 0; my $srcdir = "."; my $builddir = "."; @@ -327,7 +328,8 @@ 'skip=s' => \$opt_skip, 'srcdir=s' => \$srcdir, 'builddir=s' => \$builddir, - 'verbose' => \$opt_verbose + 'verbose' => \$opt_verbose, + 'testenv' => \$opt_testenv ); exit(1) if (not $result); @@ -515,22 +517,36 @@ delete $ENV{DOMAIN}; -foreach (@todo) { - $i++; - my $cmd = $$_[1]; - $cmd =~ s/([\(\)])/\\$1/g; - my $name = $$_[0]; - - if (skip($name)) { - print "SKIPPED: $name\n"; - $statistics->{SUITES_SKIPPED}++; - next; - } +if ($opt_testenv) { + my $term = $ENV{TERM} or "xterm"; + system("$term -e 'echo -e \"Welcome to the Samba4 Test environment +This matches the client environment used in make test +smbd is pid `cat \$PIDDIR/smbd.pid` - if ($from_build_farm) { - run_test_buildfarm($name, $cmd, $i, $suitestotal); - } else { - run_test_plain($name, $cmd, $i, $suitestotal); +Some useful environment variables: +AUTH=\$AUTH +TORTURE_OPTIONS=\$TORTURE_OPTIONS +CONFIGURATION=\$CONFIGURATION +SERVER=\$SERVER +NETBIOSNAME=\$NETBIOSNAME\" && bash'"); +} else { + foreach (@todo) { + $i++; + my $cmd = $$_[1]; + $cmd =~ s/([\(\)])/\\$1/g; + my $name = $$_[0]; + + if (skip($name)) { + print "SKIPPED: $name\n"; + $statistics->{SUITES_SKIPPED}++; + next; + } + + if ($from_build_farm) { + run_test_buildfarm($name, $cmd, $i, $suitestotal); + } else { + run_test_plain($name, $cmd, $i, $suitestotal); + } } } Deleted: branches/SAMBA_4_0/source/script/tests/testenv.pl =================================================================== --- branches/SAMBA_4_0/source/script/tests/testenv.pl 2007-03-07 01:46:02 UTC (rev 21732) +++ branches/SAMBA_4_0/source/script/tests/testenv.pl 2007-03-07 02:11:40 UTC (rev 21733) @@ -1,42 +0,0 @@ -#!/usr/bin/perl - -use FindBin qw($RealBin); -use lib "$RealBin"; - -use Samba4; -use SocketWrapper; - -my $vars = Samba4::provision("st"); -foreach (keys %$vars) { $ENV{$_} = $vars->{$_}; } -SocketWrapper::set_default_iface(1); -my $test_fifo = "st/smb_test.fifo"; -my $socket_wrapper_dir = SocketWrapper::setup_dir("$vars->{PREFIX_ABS}/w"); -Samba4::smbd_check_or_start("bin", $test_fifo, $ENV{SMBD_TEST_LOG}, $socket_wrapper_dir, undef, $ENV{CONFFILE}); -SocketWrapper::set_default_iface(6); -my $interfaces = join(',', ("127.0.0.6/8", - "127.0.0.7/8", - "127.0.0.8/8", - "127.0.0.9/8", - "127.0.0.10/8", - "127.0.0.11/8")); - -push (@torture_options, "--option=interfaces=$interfaces", - $ENV{CONFIGURATION}, - "--target=samba4"); - -$ENV{TORTURE_OPTIONS} = join(' ', @torture_options); - -open(DATA, ">$test_fifo"); -Samba4::wait_for_start(); -system("xterm -e 'echo -e \"Welcome to the Samba4 Test environment -This matches the client environment used in make test -smbd is pid `cat \$PIDDIR/smbd.pid` - -Some useful environment variables: -AUTH=\$AUTH -TORTURE_OPTIONS=\$TORTURE_OPTIONS -CONFIGURATION=\$CONFIGURATION -SERVER=\$SERVER -NETBIOSNAME=\$NETBIOSNAME\" && bash'"); -close(DATA); -
