Hash :
0449a902
Author :
Date :
2019-03-22T16:03:54
Move gpu_test_expectations from third_party into ANGLE. 1. Copy the code from src/tests/third_party/gpu_test_expectations to src/test/test_expectations, rename .cc files to .cpp. Put these in a new static library and update dEQP to link against it in src/tests/BUILD.gn. 2. Merge the code in angle_config.h into the rest of the expectations parser, this code was added so that the rest of the parser would compile in ANGLE's tree with minimal modification. Still need to follow up with the third step to close the issue. Bug: angleproject:2677 Change-Id: Icf09b4eeed83a6d09b1964ad2adcfa85cabb4b63 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1536312 Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Geoff Lang <geofflang@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.