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/buildtest.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/buildtest.cmd')
| -rw-r--r-- | tests/buildtest.cmd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/buildtest.cmd b/tests/buildtest.cmd index a2ebdf07c3..c8823f961e 100644 --- a/tests/buildtest.cmd +++ b/tests/buildtest.cmd @@ -8,15 +8,15 @@ set "__SourceDir=%__ProjectDir%\src" set "__TestDir=%__ProjectDir%\tests" set "__ProjectFilesDir=%__TestDir%" set "__PackagesDir=%__ProjectDir%\packages" -set "__RootBinDir=%__ProjectDir%\binaries" +set "__RootBinDir=%__ProjectDir%\bin" set "__LogsDir=%__RootBinDir%\Logs" :Arg_Loop if "%1" == "" goto ArgsDone if /i "%1" == "x64" (set __BuildArch=x64&shift&goto Arg_Loop) -if /i "%1" == "debug" (set __BuildType=debug&shift&goto Arg_Loop) -if /i "%1" == "release" (set __BuildType=release&shift&goto Arg_Loop) +if /i "%1" == "debug" (set __BuildType=Debug&shift&goto Arg_Loop) +if /i "%1" == "release" (set __BuildType=Release&shift&goto Arg_Loop) if /i "%1" == "clean" (set __CleanBuild=1&shift&goto Arg_Loop) @@ -27,14 +27,14 @@ goto Usage if not defined __BuildArch set __BuildArch=x64 -if not defined __BuildType set __BuildType=debug +if not defined __BuildType set __BuildType=Debug if not defined __BuildOS set __BuildOS=Windows_NT set "__TestBinDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%" :: We have different managed and native intermediate dirs because the managed bits will include :: the configuration information deeper in the intermediates path. -set "__NativeTestIntermediatesDir=%__RootBinDir%\tests\intermediates\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__ManagedTestIntermediatesDir=%__RootBinDir%\tests\intermediates" +set "__NativeTestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__ManagedTestIntermediatesDir=%__RootBinDir%\tests\obj" set "__TestManagedBuildLog=%__LogsDir%\Tests_Managed_%__BuildOS%__%__BuildArch%__%__BuildType%.log" set "__TestNativeBuildLog=%__LogsDir%\Tests_Native_%__BuildOS%__%__BuildArch%__%__BuildType%.log" set "__XunitWrapperBuildLog=%__LogsDir%\Tests_XunitWrapper_%__BuildOS%__%__BuildArch%__%__BuildType%.log" |