AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable xcrun validation on Travis for now.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2017-02-05 11:04:45 +01:00
parent 5dd7c04195
commit 70743b9be4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -24,5 +24,5 @@ script:
- make -j2 - make -j2
- PATH=./glslang/StandAlone:./SPIRV-Tools/tools:$PATH - PATH=./glslang/StandAlone:./SPIRV-Tools/tools:$PATH
- ./test_shaders.py shaders - ./test_shaders.py shaders
- ./test_shaders.py --metal shaders-msl - ./test_shaders.py --metal shaders-msl --force-no-external-validation
- ./test_shaders.py --hlsl shaders-hlsl - ./test_shaders.py --hlsl shaders-hlsl

9
test_shaders.py
View File

@ -12,6 +12,7 @@ import shutil
import argparse import argparse
import codecs import codecs
force_no_external_validation = False
def parse_stats(stats): def parse_stats(stats):
m = re.search('([0-9]+) work registers', stats) m = re.search('([0-9]+) work registers', stats)
@ -276,6 +277,8 @@ def test_shader_msl(stats, shader, update, keep):
spirv, msl = cross_compile_msl(joined_path) spirv, msl = cross_compile_msl(joined_path)
regression_check(shader, msl, update, keep) regression_check(shader, msl, update, keep)
os.remove(spirv) os.remove(spirv)
if not force_no_external_validation:
validate_shader_msl(shader) validate_shader_msl(shader)
def test_shader_hlsl(stats, shader, update, keep): def test_shader_hlsl(stats, shader, update, keep):
@ -325,6 +328,9 @@ def main():
parser.add_argument('--hlsl', parser.add_argument('--hlsl',
action = 'store_true', action = 'store_true',
help = 'Test HLSL backend.') help = 'Test HLSL backend.')
parser.add_argument('--force-no-external-validation',
action = 'store_true',
help = 'Disable all external validation.')
args = parser.parse_args() args = parser.parse_args()
if not args.folder: if not args.folder:
@ -334,6 +340,9 @@ def main():
if args.metal: if args.metal:
print_msl_compiler_version() print_msl_compiler_version()
global force_no_external_validation
force_no_external_validation = args.force_no_external_validation
test_shaders(args.folder, args.update, args.malisc, args.keep, 'metal' if args.metal else ('hlsl' if args.hlsl else 'glsl')) test_shaders(args.folder, args.update, args.malisc, args.keep, 'metal' if args.metal else ('hlsl' if args.hlsl else 'glsl'))
if args.malisc: if args.malisc:
print('Stats in stats.csv!') print('Stats in stats.csv!')