Hash :
e79c2d1f
Author :
Date :
2016-09-09T16:33:09
Add newlines to error messages. Looks like this breaks parsing tests list in gtest runner, which causes deqp_gles2 to fail on Nexus 5X swarmed bot. Driveby fix of HowToMakeChanges md format. BUG=angleproject:1471 Change-Id: I6cfa2d9287385aabf2aee47521e5e55e309831c0 Reviewed-on: https://chromium-review.googlesource.com/383813 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Because the gpu_test_expectations directory is based on parts of Chromium’s gpu/config
directory, we want to keep a patch of the changes added to make it compile with ANGLE. This
will allow us to merge Chromium changes easily in our gpu_test_expectations.
In order to make a change to this directory, do the following:
gpu_test_expectations_reverted gpu_test_expectations_reverted run patch -p 1 -R < angle-mods.patch gpu_test_expectations diff -rupN gpu_test_expectations_reverted gpu_test_expectations > angle-mods.patch angle-mods.patch in gpu_test_expectations How to update from Chromium:
git apply -R angle-mods.patch, git add . -u, git commit git add . -u, git commit git revert HEAD~ rm angle-mods.patch git diff HEAD~ (`)ls(`) > angle-mods.patch,git add angle-mods.patch, git commit --amend git rebase -i to squash the three patches into one.
Because the ```gpu_test_expectations``` directory is based on parts of Chromium's ```gpu/config```
directory, we want to keep a patch of the changes added to make it compile with ANGLE. This
will allow us to merge Chromium changes easily in our ```gpu_test_expectations```.
In order to make a change to this directory, do the following:
* copy the directory somewhere like in ```gpu_test_expectations_reverted```
* in ```gpu_test_expectations_reverted``` run ```patch -p 1 -R < angle-mods.patch```
* do your changes in ```gpu_test_expectations```
* delete angle-mods.patch in both directories
* run ```diff -rupN gpu_test_expectations_reverted gpu_test_expectations > angle-mods.patch```
* copy ```angle-mods.patch``` in ```gpu_test_expectations```
How to update from Chromium:
* ```git apply -R angle-mods.patch```, ```git add . -u```, ```git commit```
* Copy over Chromium files, ```git add . -u```, ```git commit```
* ```git revert HEAD~```
* ```rm angle-mods.patch```
* ```git diff HEAD~ (`)ls(`) > angle-mods.patch```,```git add angle-mods.patch```, ```git commit --amend```
* ```git rebase -i``` to squash the three patches into one.