diff options
| author | Syoyo Fujita <syoyo@lighttransport.com> | 2016-04-19 13:11:55 +0900 |
|---|---|---|
| committer | Syoyo Fujita <syoyo@lighttransport.com> | 2016-04-19 13:11:55 +0900 |
| commit | a55247574c2c2436989a9a0654c51a62cc7193ba (patch) | |
| tree | af70de47ba36ec6c9e67b938de7e331e1db864f4 /tests | |
| parent | f4695de408516f45652b161a34bb62fbe6edec07 (diff) | |
| download | tinyobjloader-a55247574c2c2436989a9a0654c51a62cc7193ba.tar.gz | |
Suppress VC2013 warnings.
Update AppVeyor script.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/config-msvc.py | 2 | ||||
| -rw-r--r-- | tests/tester.cc | 23 | ||||
| -rw-r--r-- | tests/vcbuild.bat | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/tests/config-msvc.py b/tests/config-msvc.py index 06fae62..a7771de 100644 --- a/tests/config-msvc.py +++ b/tests/config-msvc.py @@ -32,7 +32,7 @@ cflags = { cxxflags = { "gnu" : [ "-O2", "-g" ] - , "msvc" : [ "/O2" ] + , "msvc" : [ "/O2", "/W4", "/EHsc"] , "clang" : [ "-O2", "-g", "-fsanitize=address" ] } diff --git a/tests/tester.cc b/tests/tester.cc index edb92ba..f16eeb0 100644 --- a/tests/tester.cc +++ b/tests/tester.cc @@ -300,6 +300,29 @@ TEST_CASE("cornell_box", "[Loader]") { REQUIRE(true == TestLoadObj("../models/cornell_box.obj", gMtlBasePath)); } +TEST_CASE("catmark_torus_creases0", "[Loader]") { + + tinyobj::attrib_t attrib; + std::vector<tinyobj::shape_t> shapes; + std::vector<tinyobj::material_t> materials; + + std::string err; + bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &err, "../models/catmark_torus_creases0.obj", gMtlBasePath, /*triangulate*/false); + + if (!err.empty()) { + std::cerr << err << std::endl; + } + + REQUIRE(true == ret); + + REQUIRE(1 == shapes.size()); + REQUIRE(8 == shapes[0].mesh.tags.size()); +} + +TEST_CASE("stream_load", "[Stream]") { + REQUIRE(true == TestStreamLoadObj()); +} + #if 0 int main( diff --git a/tests/vcbuild.bat b/tests/vcbuild.bat index 3dbc6c1..e864673 100644 --- a/tests/vcbuild.bat +++ b/tests/vcbuild.bat @@ -1,3 +1,4 @@ chcp 437 +python kuroga.py config-msvc.py call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64 ninja |