From 7819f9b6680c171452d64d435db0b3c3b454445b Mon Sep 17 00:00:00 2001 From: Brad Henry Date: Tue, 20 Feb 2007 22:28:43 +0000 Subject: r21475: Updated vm_get_ip.pl to read the name of the environment variable containing the VM path from the command line. wintest_2k3_dc.sh is a new script which will run a group of tests against a Windows 2003 DC. The group of tests to run should be passed in on the command line. These tests were taken from the source/script/tests/test_win2k3.sh script. tests_win2k3_dc.sh is a new script intended to be called by 'make wintest_dc' (patch to source/main.mk forthcoming). This is intended to provide the basis for Windows 2003 DC testing in the build farm. In order to use these tests, you should have a DC setup as a VM in VMware server. This process is not automated yet, but can be done by following a few steps: 1. Prepare a Windows 2003 VM in VMware Server by downloading and extracting: svn://svn.samba.org/home/svn/samba/branches/SOC/bnh/vm_setup.tar.gz and following the instructions in the README file. 2. Copying the following file onto the filesystem of the VM configured in step 1: svn://svn.samba.org/home/svn/samba/branches/SOC/bnh/dcpromo_2k3dc_newdomain.answerfile.txt and use it to promote the VM. For example: "dcpromo /answer:" 3. On the system you are testing from, set the environment variable WINTESTCONF, and SRCDIR. WINTESTCONF should point to the path of a test_win.conf file modified for your environment. There's a default copy in source/script/tests/win/test_win.conf. SRCDIR should point to the base of your Samba 4 source tree. At that point, you should be able to run wintest_2k3_dc.sh by passing a group of tests at the command line. For example: source/script/tests/win/wintest_2k3_dc.sh RPC-DRSUAPI Sorry for the long-winded commit message! (This used to be commit a0d1c690de2e58eddf5517eb974e09c2bba23605) --- source4/script/tests/tests_win2k3_dc.sh | 22 ++++++ source4/script/tests/win/vm_get_ip.pl | 2 +- source4/script/tests/win/wintest_2k3_dc.sh | 116 +++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 1 deletion(-) create mode 100755 source4/script/tests/tests_win2k3_dc.sh create mode 100755 source4/script/tests/win/wintest_2k3_dc.sh (limited to 'source4/script') diff --git a/source4/script/tests/tests_win2k3_dc.sh b/source4/script/tests/tests_win2k3_dc.sh new file mode 100755 index 0000000000..281361475f --- /dev/null +++ b/source4/script/tests/tests_win2k3_dc.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ ! $WINTESTCONF ]; then + echo "Environment variable WINTESTCONF has not been defined." + echo "Windows tests will not run unconfigured." + exit 1 +fi + +if [ ! -r $WINTESTCONF ]; then + echo "$WINTESTCONF could not be read." + exit 1 +fi + +. script/tests/test_functions.sh + +export SRCDIR=$SRCDIR + +tests="RPC-DRSUAPI RPC-SPOOLSS ncacn_np ncacn_ip_tcp" + +for name in $tests; do + testit $name $SRCDIR/script/tests/win/wintest_2k3_dc.sh $name +done diff --git a/source4/script/tests/win/vm_get_ip.pl b/source4/script/tests/win/vm_get_ip.pl index ee04fe6a99..9286786155 100644 --- a/source4/script/tests/win/vm_get_ip.pl +++ b/source4/script/tests/win/vm_get_ip.pl @@ -19,7 +19,7 @@ sub check_error { } # Read in parameters from environment. -my $vm_cfg_path = $ENV{'VM_CFG_PATH'}; +my $vm_cfg_path = $ENV{"$ARGV[0]"}; my $host_server_name = $ENV{'HOST_SERVER_NAME'}; my $host_server_port = $ENV{'HOST_SERVER_PORT'}; if (!defined($host_server_port)) { diff --git a/source4/script/tests/win/wintest_2k3_dc.sh b/source4/script/tests/win/wintest_2k3_dc.sh new file mode 100755 index 0000000000..7949dc4b9a --- /dev/null +++ b/source4/script/tests/win/wintest_2k3_dc.sh @@ -0,0 +1,116 @@ +#!/bin/sh + +if [ $# -lt 1 ]; then +cat <