diff options
author | Matt Mitchell <mmitche@microsoft.com> | 2015-04-01 16:07:45 -0700 |
---|---|---|
committer | Matt Mitchell <mmitche@microsoft.com> | 2015-04-01 16:07:45 -0700 |
commit | 08fa669ea1857e5dfbda0fecb7adb85ee7acd1ed (patch) | |
tree | df4d6812ca52bc07e75c82750ef95a092ba4e356 /tests/runtest.cmd | |
parent | 268f0a413d807a5edacf33a9e5f514c7b19f7104 (diff) | |
parent | 838807429a0828a839958e3b7d392d65886c8f2e (diff) | |
download | coreclr-08fa669ea1857e5dfbda0fecb7adb85ee7acd1ed.tar.gz coreclr-08fa669ea1857e5dfbda0fecb7adb85ee7acd1ed.tar.bz2 coreclr-08fa669ea1857e5dfbda0fecb7adb85ee7acd1ed.zip |
Merge branch 'master' into usage-exit-code
Conflicts:
build.cmd
Diffstat (limited to 'tests/runtest.cmd')
-rw-r--r-- | tests/runtest.cmd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/runtest.cmd b/tests/runtest.cmd index ffefb5e9fc..4978618980 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -38,9 +38,9 @@ if not defined VSINSTALLDIR echo Error: runtest.cmd should be run from a Visual if not defined __BuildArch set __BuildArch=x64 if not defined __BuildType set __BuildType=debug if not defined __BuildOS set __BuildOS=Windows_NT -if not defined __BinDir set __BinDir=%__ProjectFilesDir%..\binaries\Product\%__BuildOS%.%__BuildArch%.%__BuildType% -if not defined __TestWorkingDir set __TestWorkingDir=%__ProjectFilesDir%..\binaries\tests\%__BuildOS%.%__BuildArch%.%__BuildType% -if not defined __LogsDir set __LogsDir=%__ProjectFilesDir%..\binaries\Logs +if not defined __BinDir set __BinDir=%__ProjectFilesDir%..\bin\Product\%__BuildOS%.%__BuildArch%.%__BuildType% +if not defined __TestWorkingDir set __TestWorkingDir=%__ProjectFilesDir%..\bin\tests\%__BuildOS%.%__BuildArch%.%__BuildType% +if not defined __LogsDir set __LogsDir=%__ProjectFilesDir%..\bin\Logs :: Default global test environmet variables if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\ |