Merge pull request #272 from antiagainst/appveyor

Configuration for Windows buildbot & fix a bug
This commit is contained in:
John Kessenich 2016-05-10 09:38:37 -06:00
commit 210c6bf4d8
3 changed files with 46 additions and 6 deletions

40
.appveyor.yml Normal file
View File

@ -0,0 +1,40 @@
# Windows Build Configuration for AppVeyor
# http://www.appveyor.com/docs/appveyor-yml
# build version format
version: "{build}"
os: Visual Studio 2013
platform:
- Any CPU
configuration:
- Debug
- Release
branches:
only:
- master
clone_depth: 5
matrix:
fast_finish: true # Show final status immediately if a test fails.
# scripts that run after cloning repository
install:
- git clone https://github.com/google/googletest.git External/googletest
build:
parallel: true # enable MSBuild parallel builds
verbosity: minimal
build_script:
- mkdir build && cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=install
- cmake --build . --config %CONFIGURATION% --target install
test_script:
- ctest -C %CONFIGURATION% --output-on-failure
- cd ../Test && bash runtests

View File

@ -40,13 +40,13 @@
namespace spv {
void SpvBuildLogger::tbdFunctionality(const char* f)
void SpvBuildLogger::tbdFunctionality(const std::string& f)
{
if (std::find(std::begin(tbdFeatures), std::end(tbdFeatures), f) == std::end(tbdFeatures))
tbdFeatures.push_back(f);
}
void SpvBuildLogger::missingFunctionality(const char* f)
void SpvBuildLogger::missingFunctionality(const std::string& f)
{
if (std::find(std::begin(missingFeatures), std::end(missingFeatures), f) == std::end(missingFeatures))
missingFeatures.push_back(f);

View File

@ -48,9 +48,9 @@ public:
SpvBuildLogger(const SpvBuildLogger&) = delete;
// Registers a TBD functionality.
void tbdFunctionality(const char* f);
void tbdFunctionality(const std::string& f);
// Registers a missing functionality.
void missingFunctionality(const char* f);
void missingFunctionality(const std::string& f);
// Logs a warning.
void warning(const std::string& w) { warnings.push_back(w); }
@ -62,8 +62,8 @@ public:
std::string getAllMessages() const;
private:
std::vector<const char*> tbdFeatures;
std::vector<const char*> missingFeatures;
std::vector<std::string> tbdFeatures;
std::vector<std::string> missingFeatures;
std::vector<std::string> warnings;
std::vector<std::string> errors;
};