Jared Mulconry
5e5b7f4f75
Refined the appveyor config so that test output is reported even if tests fail.
2017-10-08 17:06:23 +11:00
Jared Mulconry
5149149b07
The environment section doesn't do what I thought it would. Duplication is bad, but seems neccessary.
2017-10-08 16:31:46 +11:00
Jared Mulconry
58ac747634
Fixed some bad usage of environment variables.
2017-10-08 16:28:43 +11:00
Jared Mulconry
90c9884c5e
The environment section uses different syntax for a list of vars.
2017-10-08 16:24:05 +11:00
Jared Mulconry
81d3010f73
Added the mtime_cache script to hopefully improve use of incremental building with appveyor.
...
Reduced the verbosity of the appveyor config.
Added use of mtime_cache.
Fixed the output of an xml version of the test output for hooking into appveyor.
2017-10-08 16:21:32 +11:00
Jared Mulconry
52da099738
Updated test output to log to xml and to upload those results appropriately, so they show up in AppVeyor correctly as tests at the end.
2017-10-08 13:00:27 +11:00
Jared Mulconry
6a2dfb1efc
Fixed up the path to the build artifacts to be cached.
2017-10-08 12:44:54 +11:00
Jared Mulconry
3e80aabde5
Attempting to get tests to run.
2017-10-08 12:32:14 +11:00
Jared Mulconry
26851880e4
Attempting to address issues with cloning the repo. shallow_copy seems to fail at times. I'll let it continue to clone the whole history.
2017-10-08 11:55:54 +11:00
Kim Kulling
b57011552b
Merge branch 'master' into issue_1453
2017-10-07 19:08:52 +02:00
Kim Kulling
f925e2cf4e
Reproduce issue and remove assertion when a nullptr makes more sence
2017-10-07 19:08:20 +02:00
Jared Mulconry
fe79322959
Attempting to get the tests detected and run.
2017-10-08 02:22:37 +11:00
Jared Mulconry
d3de8dbf5f
Paths aren't what I expected for the test directory. Trying something else, with a testing call to dir to help track it down.
2017-10-08 02:03:00 +11:00
Jared Mulconry
ba43e3a152
x86 isn't a valid VS platform. Win32 it is, then.
2017-10-08 01:55:10 +11:00
Jared Mulconry
4c06abf281
Replaced the worker image name, which doesn't work as generator name, with a manually created generator name.
2017-10-08 01:49:31 +11:00
Jared Mulconry
75eb2ad071
Merge branch 'master' into appveyor
2017-10-08 00:34:02 +10:00
Jared Mulconry
63764ae42a
Apparently @ escaping batch commands doesn't work in this context.
2017-10-08 01:33:48 +11:00
Jared Mulconry
8f54892439
Cleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add running of tests.
2017-10-08 01:27:21 +11:00
turol
8e8ed97750
Merge pull request #1478 from turol/travis
...
Travis refactoring
2017-10-07 16:29:59 +03:00
Turo Lamminen
10b49dfd25
Travis: Remove old attempt at disabling default configurations
...
This didn't actually work and now the default configurations are important.
2017-10-07 15:41:16 +03:00
Turo Lamminen
684cb88e83
Travis: Remove redundant config
2017-10-07 15:40:06 +03:00
Turo Lamminen
bd65811329
Travis: Rename TRAVIS_NO_EXPORT to DISABLE_EXPORTERS so its meaning is more obvious
2017-10-07 15:39:36 +03:00
Turo Lamminen
69b8c1f60d
Travis: TRAVIS_NO_EXPORT is now implicitly off, disable explicit off
2017-10-07 15:36:54 +03:00
Turo Lamminen
f2cf8bf075
Travis: Disable GCC AddressSanitizer build, Clang AddressSanitizer is strictly better
2017-10-07 15:08:41 +03:00
Turo Lamminen
ea58801a2d
Travis: ENABLE_COVERALLS is now implicitly off, disable explicit off
2017-10-07 15:08:02 +03:00
Turo Lamminen
7037fdfe2c
Travis: ASAN is now implicitly off, disable explicit off
2017-10-07 15:06:46 +03:00
Turo Lamminen
42142105fa
CMake: Be more verbose about enabled options
2017-10-07 14:59:12 +03:00
Turo Lamminen
54d14e6e3b
Travis: Refactor how we build CMake options
2017-10-07 14:47:52 +03:00
Turo Lamminen
5301768256
Travis: Remove unused LINUX env variable
2017-10-07 14:33:34 +03:00
Marco Di Benedetto
9a79d243f9
added additional displacement texture token.
2017-10-07 12:36:02 +02:00
turol
cc562b2b1c
Merge pull request #1477 from turol/clang
...
Enable Travis clang build
2017-10-06 19:19:56 +03:00
Jared Mulconry
326158633b
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 18:23:28 +03:00
Turo Lamminen
50b43f76e1
OpenGEXImporter: Copy materials to scene
2017-10-06 18:23:28 +03:00
Turo Lamminen
b841ed194b
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
Turo Lamminen
775f984d99
OpenGEXImporter: Fix IOStream leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
22b55d01a2
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
Turo Lamminen
61278aa408
AMFImporter: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
1f16ed9fd0
UnrealLoader: Fix IOStream leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
1bee5b0025
utRemoveVCProcess: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
9eef4c16a8
utMetadata: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
9f5b58e706
Upgrade RapidJSON to get rid of a clang warning
2017-10-06 18:23:28 +03:00
Turo Lamminen
ae8a4c0c62
Fix warning about non-constant array size
2017-10-06 18:22:58 +03:00
Turo Lamminen
d28e88feb7
CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build
2017-10-06 18:22:58 +03:00
Turo Lamminen
5cc316b874
Travis: Treat warnings as errors, without typos this time
2017-10-06 18:22:58 +03:00
Turo Lamminen
a3053eb358
Travis: Build with clang too
2017-10-06 18:22:58 +03:00
turol
8ef219b985
Merge pull request #1476 from assimp/revert-1471-clang
...
Revert "WIP: Enable Travis clang build"
2017-10-06 18:19:54 +03:00
Kim Kulling
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
Kim Kulling
4a9ab98240
Merge pull request #1474 from jaredmulconry/issue_1470
...
Update zlib contribution
2017-10-06 15:40:36 +02:00
Kim Kulling
c9b9dab1ff
Merge pull request #1475 from jaredmulconry/master
...
Fixed warning on clang 3.9 caused by static data member in class template
2017-10-06 15:37:33 +02:00
Kim Kulling
b360838ef6
Merge pull request #1471 from turol/clang
...
WIP: Enable Travis clang build
2017-10-06 15:36:53 +02:00