-{wiki: BtsTestingCondorOnWindows BT's Testing Condor On Windows }
+Look here for BT's instructions: {wiki: BtsTestingCondorOnWindows BT's Testing Condor On Windows }
 
 {section: Requirements}
 
-
 *: Install Active-State Perl
-*: Install HTCondor("condor_install -make-personal")
-
-
-in CS to have networking work the best, my condor_config looks like this:
-
-{code}
-use ROLE : CentralManager Execute Submit
-CONDOR_HOST = bt-laptop.cs.wisc.edu
-#use ROLE : Personal
-#CONDOR_HOST = 127.0.0.1
-COLLECTOR_HOST = $(CONDOR_HOST):0
-
-# use host based security, modified to allow the other crane to join the pool.
-use SECURITY : HOST_BASED
-if 1
-MY_CS_SUBNET = 128.105.136
-BT_IP = $(MY_CS_SUBNET).32
-ALLOW_READ = $(CONDOR_HOST) $(BT_IP)/8 $(IP_ADDRESS)
-ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR) $(BT_IP)
-ALLOW_WRITE = $(ALLOW_ADMINISTRATOR)
-endif
-{endcode}
+*: Make a git clone of the HTCondor repo OR unpack the source tarball
+*: Build HTCondor for Windows: {wiki: BuildingHtcondorOnWindows Instructions }
 
-On my laptop in CS my condor_config.local looks like this:
-
-{code}
-FULL_HOSTNAME = bt-laptop.cs.wisc.edu
-MASTER_NEW_BINARY_RESTART   = PEACEFUL
-RunBenchmarks = 0
-NUM_CPUS = 12
-MASTER_DEBUG = D_CAT D_FULLDEBUG
-{endcode}
 
 {section: Preparing for testing}
 
 The easiest way to get an ititial Windows HTCondor test environment
-is to install the HTCondor msi. Take all the defaults and when you get
-to where jobs run, allow them to run unimpeeded on the current system.
-(After you have a test machine set up, you can replace the binaries with ones
-from the zip file release for HTCondor)
+is to build HTCondor from git.  It is possible to download the HTCondor MSI or tarball and test that, but you will need to also have the tests and the msconfig tools that you get from a git clone or from the source tarball.
 
 {section: Testing needs}
 
-On my laptop I have the MSI installed to c:\condor with my test location assembled in c:\condor_tests and condor_examples in c:\condor_examples.
-
-There are four things needed for testing on windows that need to be assembled
+There are five things needed for testing on windows that need to be assembled
 
-1: built tests
-1: all sources for src/condor_tests and src/condor_examples
+1: built HTCondor release_dir or equivalent (unpack the .ZIP release)
+1: all sources for src/condor_tests including subdirectories
 1: Condor.PM, CondorUtils.pm, CondorTest.pm, CondorPersonal.pm and batch_tests.pl from src/condor_scripts
-1: placement choices: The directory condor_examples needs to be in same folder as condor_tests.
-1: If the condor perl modules are not in a well known system location place them in your selected test location.
-
-{code}
-Add to the system PATH environment variable the location of the HTCondor binaries
-{endcode}
+1: built tests
+1: working personal HTCondor config
 
-{section: Set Up Option 1 - Building on windows from git clone}
+{section: Get tests from the HTCondor sources}
 
-1: You have a git clone and built the tests
-1: Copy to a testing location of your choice from the clone parts as mentioned above
-   condor_examples
-   condor_scripts
-   condor_tests
-1: Copy Condor.PM, CondorUtils.pm, CondorTest.pm, CondorPersonal.pm and batch_tests.plfrom condor_scripts to your condor testing location/condor_tests
-1: Place condor_examples(from clone) in the same folder as your selected testing location. ie "your condor_testing location"/condor_examples
-1: Copy all of the built tests contents to your selected condor testing location/condor_tests
-1: After the BLD_TESTS step of the build, depending on kind of build, you need to fetch , at a minimum, the build exe files for tests and copy them to your condor_testing location/condor_tests. In my case since I do a debug build in c:\condor_localbuild, these files are located in c:\condor_localbuild\src\condor_tests\RelWithDebInfo
+You must copy some files from the condor sources into into the directory you wish to test in.
 
+{term}
+set SRCDIR=\scratch\CONDOR_SRC
+set testdir=\scratch\test001
+mkdir %testdir%
+xcopy /Q /Y "%SRCDIR%\src\condor_tests\*" "%testdir%\condor_tests\"
+xcopy /Q /Y "%SRCDIR%\src\condor_tests\Check\*" "%testdir%\condor_tests\Check\"
+xcopy /Q /Y "%SRCDIR%\src\condor_scripts\*.pm" "%testdir%\condor_tests\"
+xcopy /Q /Y "%SRCDIR%\src\condor_scripts\*.pl" "%testdir%\condor_tests\"
+{endterm}
+
+{section: Install HTCondor in the test dir and create a configuration }
+
+CD to the directory where HTCondor is built (where your condor.sln file is), build the tests, and install HTCondor into the testing directory.
+
+Install HTCondor into the testing dir
+{term}
+cd \scratch\build
+set testdir=\scratch\test001
+cmake -DBUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=%testdir% -P cmake_install.cmake
+{endterm}
+
+Build the tests and copy them into the testing dir
+{term}
+devenv condor.sln /Build Debug /Project BLD_TESTS
+xcopy /Q /Y src\condor_tests\list_* "%testdir%\condor_tests\"
+xcopy /Q /Y src\condor_tests\Debug\*.exe "%testdir%\condor_tests\"
+xcopy /Q /Y src\condor_tests\Debug\*.pdb "%testdir%\condor_tests\"
+{endterm}
+
+Create a HTCondor configuration that all of the tests will derive from
+and set CONDOR_CONFIG to point to it.
+{term}
+pushd "%testdir%"
+cscript "%SRCDIR%\msconfig\init_config.wff" ETC=etc PERSONAL=Y RUNJOBS=A
+mkdir log
+mkdir spool
+mkdir execute
+popd
+{endterm}
+
+Set PATH and CONDOR_CONFIG environment variables
+{term}
+set CONDOR_CONFIG=%testdir%\condor_config
+set PATH=%testdir%\bin;%PATH%
+{endterm}
+
+Start HTCondor and verify that it is running
+{term}
+start %testdir%\bin\condor_master -f -t
+tail -f %testdir%\log\MasterLog
+{endterm}
 
 You should now be able to run single tests in the testing location you chose
 for test XXX.run:
 
 {code}
+cd %testdir%\condor_tests
 batch_test.pl -d . -t XXX.run
 {endcode}
 
-{section: Set Up Option 2 - using either condor_tests.zip or}
-
-
-1: you still want to have a fully installed HTCondor from the msi with the path to the release binaries in the system path.
-1: A Unzip condor_tests.zip to some folder and in that folder run the batch_test.pl command above.
-1: B Go to http://submit-3.batlab.org/results/continuous.php
-1: Choose a suitable build. master will be the next devleoper release or V8_[2,4] for the latest stable build. Under each platform are two color coded boxes. The one on the left under any platform will take you to the builds of all the platforms.
-1: Under the windows 8 build steps will be a remote_post step. If green
-click on it and get the file "results.tar.gz".
-1: Choose where your testing location will be and place only the "condor_examples" and "condor_tests" folders. These are complete with all you need for testing
-1: Go into that condor_tests folder and run the batch_test.pl command above
-
 
 {section: Results}
-
-batch_test.pl runs a single test currently and will be renamed run_tests.pl in the next deveoper series(V8_5). We are still deciding how to auto test multiple tests from a known list per platform.