Hash :
47ac69c1
Author :
Date :
2015-11-24T11:15:57
Update gpu_test_expectations to support OSX 10.11 On the Chromium side there was also a large refactor of SplitString. This patch includes a replication of that refactor in string_utils and adds the Chromium unittests to string_utils_unittests.cpp BUG=angleproject:1234 Change-Id: I4f71064fbf325c204e98a7b36ead118913d90f2c Reviewed-on: https://chromium-review.googlesource.com/314101 Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@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 ourgpu_test_expectations. In order to make a change to this directory, do the following: * copy the directory somewhere like ingpu_test_expectations_reverted* ingpu_test_expectations_revertedrunpatch -p 1 -R < angle-mods.patch* do your changes ingpu_test_expectations* delete angle-mods.patch in both directories * rundiff -rupN gpu_test_expectations_reverted gpu_test_expectations > angle-mods.patch* copyangle-mods.patchingpu_test_expectationsHow 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.
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.