-
Notifications
You must be signed in to change notification settings - Fork 360
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Windows test script return value. #533
Conversation
Using %ERRORLEVEL% inside an IF...() block captures the variable's value as the block is entered. Use !ERRORLEVEL! so error handling works as expected. Use %ERRORLEVEL% NEQ 0 in case of negative values. Ensure zero is returned if tests passed, regardless of cleanup errors. Refactor cmake flags to reduce duplication.
The failure on vs2017-debug is what we want. It was previously failing and not reporting the failure. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to audit spirv-tools, amber and anything else we're doing kokoro windows builds?
@dj2 yes, since spirv-tools and amber mostly copied these scripts, they should be fixed too. |
I have opened KhronosGroup/SPIRV-Tools#2262 |
https://chromium.googlesource.com/external/github.com/google/shaderc/+log/909f0d3d31e7..ce7d92182b8c $ git log 909f0d3..ce7d921 --date=short --no-merges --format='%ad %ae %s' 2019-01-22 fjhenigman Use the full spirv-cross dependency. (google#550) 2019-01-22 corentin BUILD.gn: fix build error on is_component_build=true (google#549) 2019-01-21 corentin BUILD.gn: Make libraries Chromium-style "components" (google#548) 2019-01-17 fjhenigman Disable spvc build by default. (google#542) (google#547) 2019-01-16 fjhenigman Fix build with exceptions off. (google#546) 2019-01-16 dneto Fix MinGW: Format %lu must be unsigned long. (google#544) 2019-01-16 dneto Fix leaks in tests (google#545) 2019-01-15 fjhenigman Fix ASAN build. (google#543) 2019-01-15 fjhenigman Add libshaderc_spvc interface to SPIRV-Cross. (google#524) 2019-01-15 fjhenigman Fix NDK build. (google#540) 2019-01-11 dneto Android.mk: better fallback for SPIRV-Tools dir (google#538) 2019-01-09 dj2 Roll RE2 Dep (google#537) 2019-01-07 dj2 Fixup source matching test (google#534) 2019-01-03 fjhenigman Fix Windows test script return value. (google#533) 2019-01-02 dj2 Switch GLSLang to upstream (google#515) 2018-12-28 alex Generate source text debug info if requested (google#455) (google#532) 2018-12-27 ehsann [kokoro] Stop running tests on VS 2013 builds. (google#531) 2018-12-21 fjhenigman Update Android NDK. (google#530) 2018-12-17 dneto Test shader uniforms need descriptor set and binding (google#523) 2018-12-17 kknb1056 Add git clone of re2 and effcee to the Dockerfile (google#527) 2018-11-28 dj2 Update to use Android.mk from glslang (google#520) 2018-11-22 dneto Add unit tests for mesh and task shaders 2018-11-21 arseny.kapoulkine Add support for NV_EXTENSIONS in #pragma shader_stage() 2018-11-19 dj2 Build file updates. (google#514) 2018-11-15 dj2 Fixup shadowed variables (google#513) 2018-10-11 dneto Unpin googletest. It has been fixed upstream 2018-11-13 dj2 Add effcee and re2 when building spirv-tools tests (google#510) 2018-10-24 dj2 Only include third_party directories if needed. (google#507) Created with: roll-dep third_party/shaderc TBR=kainino@chromium.org BUG=dawn:29 Change-Id: I30df4fe9423465d5db135874f6dec2687391e505 Reviewed-on: https://dawn-review.googlesource.com/c/4160 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Includes: 419517b spvc is optional, off by default, in Android.mk (google#563) 6099206 Remove commas for googltest test suite macro (google#561) 9e1151a Add NV_EXTENSIONS shader types on util compiler conversion. (google#559) f5abb5c Move public headers to libshaderc. (google#558) e7a1910 WIP Fix install. (google#556) 6ff17fe Fix cmake build for libshaderc_spvc. (google#554) 8e5a205 Remove use of deprecated googletest macro (google#541) 634dd35 Flesh out for Dawn fuzzers. (google#552) ce7d921 Use the full spirv-cross dependency. (google#550) cabee68 BUILD.gn: fix build error on is_component_build=true (google#549) 2dc76ac BUILD.gn: Make libraries Chromium-style "components" (google#548) fdecc63 Disable spvc build by default. (google#542) (google#547) 026d4e3 Fix build with exceptions off. (google#546) d93ef8b Fix MinGW: Format %lu must be unsigned long. (google#544) 5c97fca Fix leaks in tests (google#545) 003c82f Fix ASAN build. (google#543) a0a4695 Add libshaderc_spvc interface to SPIRV-Cross. (google#524) fcb2d4e Fix NDK build. (google#540) 14ae0de Android.mk: better fallback for SPIRV-Tools dir (google#538) 6733f17 Roll RE2 Dep (google#537) 1079643 Fixup source matching test (google#534) b9e151b Fix Windows test script return value. (google#533) 355fe6a Switch GLSLang to upstream (google#515) d6c89a6 Generate source text debug info if requested (google#455) (google#532) 3faf34a [kokoro] Stop running tests on VS 2013 builds. (google#531) a516b67 Update Android NDK. (google#530) 4727ede Test shader uniforms need descriptor set and binding (google#523) 32b6d90 Add git clone of re2 and effcee to the Dockerfile (google#527) 53c776f Update to use Android.mk from glslang (google#520) 2898ad7 Add unit tests for mesh and task shaders 44f7dd2 Add support for NV_EXTENSIONS in #pragma shader_stage() 7544155 Build file updates. (google#514) eb743ec Fixup shadowed variables (google#513) 823901b Unpin googletest. It has been fixed upstream a8bbd80 Add effcee and re2 when building spirv-tools tests (google#510) 92efe45 Only include third_party directories if needed. (google#507) 909f0d3 BUILD.gn: remove the static_library target. 818a37b [kokoro] Report error if ctest fails a4116bc [kokoro] Compile for x86_64 and print CMake version on Windows 72512db VS builds: Pin an older googletest to avoid around a CMake problem b806cd2 Disable layout and relax logical pointer for optimizer validation 196d38f BUILD.gn: Make source_set not depend on static_libraries c9da865 BUILD.gn: only use complete_static_lib on mac a1f4027 Start Shaderc v2018.1-dev development 7d8582b Finalize Shaderc v2018.0 ed3c8e3 Update CHANGES 69413e3 Fix -Wfallthrough warnings 6503446 Return *this in move-assign operator 0e81b8b Add default ctor and move assignment to CompilationResult 7193d2e Adjust to glslang's removal of NV_EXTENSIONS from headers 41d15ff BUILD.gn: make the static_lib complete to fix the build on OSX fc4ff0e Pass environment version into SPIRV-Tools properly 5804d8c Add SONAME version to the library Test: checkbuild.py on Linux; unit tests on Windows Change-Id: Ib255e3b16d7e96ce4bcc5ccaff9c178c472d8bb7
Using %ERRORLEVEL% inside an IF...() block captures the variable's
value as the block is entered. Use !ERRORLEVEL! so error handling
works as expected.
Use %ERRORLEVEL% NEQ 0 in case of negative values.
Ensure zero is returned if tests passed, regardless of cleanup errors.
Refactor cmake flags to reduce duplication.