diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2019-08-02 09:52:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 09:52:39 -0700 |
| commit | 165907550c8f6ce7506beef591f55cd3f8458d78 (patch) | |
| tree | a400e42fdb0391544aa8a829d54678c6e5690638 /scripts | |
| parent | bacbcf3527390ae7d20cd9660d82a180f2c8e065 (diff) | |
| download | vcpkg-165907550c8f6ce7506beef591f55cd3f8458d78.tar.gz vcpkg-165907550c8f6ce7506beef591f55cd3f8458d78.zip | |
Update tests, and add documentation! (#7506)
This PR does the following:
* fix tests -- now, they're always built in the CMake scripts, and they work on VS2015
*add a new flag, BUILD_TESTING, which allows one to turn off testing builds
* Add documentation for running tests
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b0e4f98a5..09d77b07d 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -249,7 +249,7 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel" rm -rf "$buildDir" mkdir -p "$buildDir" -(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=OFF" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" |