Finish ANGLE update
Created attachment 384942 [details] Finish ANGLE update
Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE
Some files were left out when the last ANGLE update patch was committed. This patch contains the rest of the files.
Comment on attachment 384942 [details] Finish ANGLE update Rejecting attachment 384942 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 384942, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 5000 characters of output: M Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/ShadeModelTest.cpp M Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureEnvTest.cpp M Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureParameterTest.cpp M Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/TextureTargetEnableTest.cpp M Source/ThirdParty/ANGLE/src/tests/gl_tests/gles1/VertexPointerTest.cpp M Source/ThirdParty/ANGLE/src/tests/gles1_conformance_tests/ConformanceTests.cpp M Source/ThirdParty/ANGLE/src/tests/perf_tests/MultiviewPerf.cpp M Source/ThirdParty/ANGLE/src/tests/perf_tests/TextureUploadPerf.cpp M Source/ThirdParty/ANGLE/src/tests/perf_tests/glmark2Benchmark.cpp M Source/ThirdParty/ANGLE/src/tests/preprocessor_tests/extension_test.cpp M Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.cpp M Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig.h M Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestConfig_mac.mm M Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.cpp M Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser.h M Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsParser_unittest.cpp M Source/ThirdParty/ANGLE/src/tests/test_expectations/GPUTestExpectationsTest.cpp M Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.cpp M Source/ThirdParty/ANGLE/src/tests/test_utils/ANGLETest.h M Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.cpp M Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h M Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.cpp M Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_instantiate.h M Source/ThirdParty/ANGLE/src/third_party/compiler/README.chromium M Source/ThirdParty/ANGLE/third_party/libpng/BUILD.gn M Source/ThirdParty/ANGLE/util/OSWindow.h M Source/ThirdParty/ANGLE/util/egl_loader_autogen.cpp M Source/ThirdParty/ANGLE/util/egl_loader_autogen.h M Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.cpp M Source/ThirdParty/ANGLE/util/fuchsia/ScenicWindow.h M Source/ThirdParty/ANGLE/util/gles_loader_autogen.cpp M Source/ThirdParty/ANGLE/util/gles_loader_autogen.h M Source/ThirdParty/ANGLE/util/osx/OSXWindow.h M Source/ThirdParty/ANGLE/util/osx/OSXWindow.mm M Source/ThirdParty/ANGLE/util/ozone/OzoneWindow.h M Source/ThirdParty/ANGLE/util/posix/crash_handler_posix.cpp M Source/ThirdParty/ANGLE/util/posix/test_utils_posix.cpp M Source/ThirdParty/ANGLE/util/shader_utils.cpp M Source/ThirdParty/ANGLE/util/test_utils.h M Source/ThirdParty/ANGLE/util/util.gni M Source/ThirdParty/ANGLE/util/windows/WGLWindow.cpp M Source/ThirdParty/ANGLE/util/windows/test_utils_win.cpp M Source/ThirdParty/ANGLE/util/windows/win32/Win32Window.cpp M Source/ThirdParty/ANGLE/util/windows/win32/test_utils_win32.cpp M Source/ThirdParty/ANGLE/util/x11/X11Window.h D+ Source/ThirdParty/ANGLE/third_party/deqp/ D+ Source/ThirdParty/ANGLE/third_party/googletest/ ERROR from SVN: A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output: The following files contain tab characters: trunk/Source/ThirdParty/ANGLE/src/tests/compiler_tests/QualificationOrder_test.cpp trunk/Source/ThirdParty/ANGLE/src/tests/deqp_support/glcShaderConstExprTests_override.cpp trunk/Source/ThirdParty/ANGLE/src/tests/deqp_support/tes31Context_override.cpp trunk/Source/ThirdParty/ANGLE/src/tests/perf_tests/MultiviewPerf.cpp Please use spaces instead to indent. If you must commit a file with tabs, use svn propset to set the "allow-tabs" property. W: 17104a8fcb6801f07aef57bce852fb5f2606bf24 and refs/remotes/origin/master differ, using rebase: :040000 040000 858f91920a97bef89eda0ffec3fb85c85d62d3a9 c3d8f6efe5be18d5586bc9e5e572acfe13fb97d8 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit 8c1a5705b7d..bbea73caca7 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 253179 = 8c1a5705b7d46f83cb26ec7d28f682a2792e4546 r253180 = e4bc0a5432aef3488f409765bd3bbeb861f2c868 r253181 = d0616189397e8d814b7fd9e605f392664438225d r253182 = f5cdaccdf71267cf578010b46036dbd1b93d6e13 r253183 = a54437af35d3257fd345cb484e3f22447f572775 r253184 = e53a86443b6c4713c8d2936de109ce03c01cbbae r253185 = bbea73caca71d4dcbf33b03f78e99a6eaa26b1af Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Total errors found: 0 in 7 files Full output: https://webkit-queues.webkit.org/results/13287267
Hmm, I guess I can try to remove the tabs in those files upstream. In the meantime, is it possible to bypass the commit queue and submit this anyway?
I've gone several times and just replaced the tabs in those four files with spaces. You could do that in the patch. I think that would be the easiest way. The other way is to add svn properties to tell it to allow tabs. Let's not.
OK, I will edit the patch. Are there any other patch changes you've been doing that I should upstream?
Not that I remember now.
Created attachment 384981 [details] Remove tabs from cpp files
Cool, thanks for your help!
Comment on attachment 384981 [details] Remove tabs from cpp files Clearing flags on attachment: 384981 Committed r253192: <https://trac.webkit.org/changeset/253192>
All reviewed patches have been landed. Closing bug.
<rdar://problem/57684213>