3 files changed, 85 insertions, 68 deletions
diff --git a/chrome_frame/test/poor_mans_trybot.bat b/chrome_frame/test/poor_mans_trybot.bat
new file mode 100644
index 0000000..a5dcf37
--- /dev/null
+++ b/chrome_frame/test/poor_mans_trybot.bat
@@ -0,0 +1,59 @@
+@ECHO OFF
+REM Copyright (c) 2009 The Chromium Authors. All rights reserved.
+REM Use of this source code is governed by a BSD-style license that can be
+REM found in the LICENSE file.
+REM
+REM Purpose of this file: If you have IE9 on your machine, not all of
+REM the Chrome Frame tests will currently pass. To run the tests on
+REM a VM or separate machine, you need to copy a bunch of things over
+REM (the tests run slowly or flakily over a network drive).
+REM
+REM To facilitate running the tests on a separate machine, Run this
+REM batch file on a VM or a separate machine, that has a drive mapped
+REM to your dev machine (so that it can access your dev workspace).
+REM
+REM Before running this file, you need to build all the chrome_frame
+REM targets plus chrome.dll and chrome.exe on your dev machine. Run
+REM the copy of this file that exists in the same workspace that you
+REM want to test.
+REM
+REM NOTE: I've seen cases where a Vista VM under Virtual PC will fail
+REM to copy all of the files from the dev machine, and doing e.g.
+REM [ dir j:\src\chrome\src\chrome\debug ] (assuming j:\src\chrome\src
+REM is your workspace on the dev machine) shows an empty filing listing
+REM when run from the VM, whereas your workspace actually just built
+REM a ton of stuff in that directory. Just be aware of it, and check
+REM what files you actually have in the local copy on the VM after
+REM running this script. If you encounter this issue, a reboot of the
+REM VM seems to help.
+
+setlocal
+set CLIENT_ROOT=%~dp0%..\..
+
+@ECHO ON
+c:
+mkdir \trybot
+cd \trybot
+rmdir /s /q base
+rmdir /s /q chrome\debug
+rmdir /s /q chrome_frame
+mkdir base
+mkdir chrome\debug
+mkdir chrome_frame\test\data
+mkdir chrome_frame\test\html_util_test_data
+copy %CLIENT_ROOT%\base\base_paths_win.cc base\base_paths_win.cc
+xcopy %CLIENT_ROOT%\chrome\debug chrome\debug /E /EXCLUDE:%CLIENT_ROOT%\chrome_frame\test\poor_mans_trybot_xcopy_filter.txt
+xcopy %CLIENT_ROOT%\chrome_frame\test\data chrome_frame\test\data /E
+xcopy %CLIENT_ROOT%\chrome_frame\test\html_util_test_data chrome_frame\test\html_util_test_data /E
+copy %CLIENT_ROOT%\chrome_frame\CFInstance.js chrome_frame\CFInstance.js
+copy %CLIENT_ROOT%\chrome_frame\CFInstall.js chrome_frame\CFInstall.js
+@ECHO OFF
+echo ************************************
+echo DO THE FOLLOWING IN AN ADMIN PROMPT:
+echo ************************************
+echo regsvr32 \trybot\chrome\debug\servers\npchrome_frame.dll
+echo *********************************
+echo THEN DO THIS IN A REGULAR PROMPT:
+echo *********************************
+echo chrome\debug\chrome_frame_unittests.exe
+echo chrome\debug\chrome_frame_tests.exe
diff --git a/chrome_frame/test/poor_mans_trybot.txt b/chrome_frame/test/poor_mans_trybot.txt
deleted file mode 100644
index d6e2e76..0000000
--- a/chrome_frame/test/poor_mans_trybot.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-### Copyright (c) 2009 The Chromium Authors. All rights reserved.
-### Use of this source code is governed by a BSD-style license that can be
-### found in the LICENSE file.
-###
-### Purpose of this file: If you have IE9 on your machine, not all of
-### the Chrome Frame tests will currently pass. The instructions
-### below, and the xcopy exclusion filter at the bottom of the file,
-### will help you run the CF tests on a machine different from your
-### build machine, e.g. on a VM.
-###
-### Name of this file: poor_mans_trybot.txt (i.e. it is the file you
-### use as the exclude list for the xcopy commands below).
-###
-### If you find this useful, feel free to automate further, but note
-### that we expect to set up a trybot for the CF tests soon.
-###
-### On a Windows Vista machine (or VM) with IE8 and FF 3.6 installed,
-### do the following (adapt to your own paths - j:\src\ybc is the root
-### of a Chrome checkout where you have just built all the
-### chrome_frame targets plus chrome.dll and chrome.exe).
-###
-### c:
-### mkdir \trybot
-### cd \trybot
-### rmdir /s /q base
-### rmdir /s /q chrome\debug
-### rmdir /s /q chrome_frame
-### mkdir base
-### mkdir chrome\debug
-### mkdir chrome_frame\test\data
-### mkdir chrome_frame\test\html_util_test_data
-### copy j:\src\ybc\src\chrome\base\base_paths_win.cc base\base_paths_win.cc
-### xcopy j:\src\ybc\src\chrome\debug chrome\debug /E \
-###     /EXCLUDE:j:\src\ybc\src\chrome_frame\test\poor_mans_trybot.txt
-### xcopy j:\src\ybc\src\chrome_frame\test\data chrome_frame\test\data /E
-### xcopy j:\src\ybc\src\chrome_frame\test\html_util_test_data \
-###     chrome_frame\test\html_util_test_data /E
-### copy j:\src\ybc\src\chrome_frame\CFInstance.js chrome_frame\CFInstance.js
-### copy j:\src\ybc\src\chrome_frame\CFInstall.js chrome_frame\CFInstall.js
-###
-### (in admin prompt)
-### cd chrome\debug\servers && regsvr32 npchrome_frame.dll
-###
-### (in regular prompt)
-### chrome\debug\chrome_frame_unittests.exe
-### chrome\debug\chrome_frame_tests.exe
-
-\lib\
-\obj\
-\installer_archive\
-.obj
-.lib
-.pdb
-.ilk
-.pyd
-.7z
-.idb
-.res
-.manifest
-_i.c
-_p.c
-.h
-.cc
-.vcproj
-.user
-.sln
-.gyp
-BuildLog.htm
diff --git a/chrome_frame/test/poor_mans_trybot_xcopy_filter.txt b/chrome_frame/test/poor_mans_trybot_xcopy_filter.txt
new file mode 100644
index 0000000..f6f2474
--- /dev/null
+++ b/chrome_frame/test/poor_mans_trybot_xcopy_filter.txt
@@ -0,0 +1,26 @@
+### Copyright (c) 2009 The Chromium Authors. All rights reserved.
+### Use of this source code is governed by a BSD-style license that can be
+### found in the LICENSE file.
+###
+### This is an xcopy filter to use with poor_mans_trybot.bat
+\lib\
+\obj\
+\installer_archive\
+.obj
+.lib
+.pdb
+.ilk
+.pyd
+.7z
+.idb
+.res
+.manifest
+_i.c
+_p.c
+.h
+.cc
+.vcproj
+.user
+.sln
+.gyp
+BuildLog.htm