diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 15:04:40 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 15:04:40 +0000 |
| commit | a57acea58a356605123ef9c8061dae0162918f6a (patch) | |
| tree | 0fdcdcf39bc878de23375b7f4154902b33977a9b /third_party/re2 | |
| parent | e96142c11bbeb3a4077f051129ab2b0f312b42aa (diff) | |
| download | chromium_src-a57acea58a356605123ef9c8061dae0162918f6a.zip chromium_src-a57acea58a356605123ef9c8061dae0162918f6a.tar.gz chromium_src-a57acea58a356605123ef9c8061dae0162918f6a.tar.bz2 | |
Remove file without license header and fix file flags of non-executable .py file.
BUG=112155
TBR=mark@chromium.org
NOTRY=TRUE
Review URL: https://chromiumcodereview.appspot.com/10834086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/re2')
| -rw-r--r-- | third_party/re2/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/re2/patches/remove-testinstall.cc-and-fix-filepermissions.patch | 29 | ||||
| -rw-r--r-- | third_party/re2/testinstall.cc | 20 |
3 files changed, 32 insertions, 20 deletions
diff --git a/third_party/re2/README.chromium b/third_party/re2/README.chromium index f11a8be..1e315e1 100644 --- a/third_party/re2/README.chromium +++ b/third_party/re2/README.chromium @@ -20,3 +20,6 @@ Local Modifications (to be applied in this order): - Fix an implicit conversion from NULL to false (patches/fix-implicit-conversion.patch) - Support Android (re2-android.patch) +- Remove testinstall.cc because it lacks a license header and remove executable + bit from non-executable .py file. + (remove-testinstall.cc-and-fix-filepermissions.patch) diff --git a/third_party/re2/patches/remove-testinstall.cc-and-fix-filepermissions.patch b/third_party/re2/patches/remove-testinstall.cc-and-fix-filepermissions.patch new file mode 100644 index 0000000..6b92769 --- /dev/null +++ b/third_party/re2/patches/remove-testinstall.cc-and-fix-filepermissions.patch @@ -0,0 +1,29 @@ +diff --git a/third_party/re2/re2/unicode.py b/third_party/re2/re2/unicode.py +old mode 100755 +new mode 100644 +diff --git a/third_party/re2/testinstall.cc b/third_party/re2/testinstall.cc +deleted file mode 100644 +index 40b7a8a..0000000 +--- a/third_party/re2/testinstall.cc ++++ /dev/null +@@ -1,20 +0,0 @@ +-#include <re2/re2.h> +-#include <re2/filtered_re2.h> +-#include <stdio.h> +- +-using namespace re2; +- +-int main(void) { +- FilteredRE2 f; +- int id; +- f.Add("a.*b.*c", RE2::DefaultOptions, &id); +- vector<string> v; +- f.Compile(&v); +- +- if(RE2::FullMatch("axbyc", "a.*b.*c")) { +- printf("PASS\n"); +- return 0; +- } +- printf("FAIL\n"); +- return 2; +-} diff --git a/third_party/re2/testinstall.cc b/third_party/re2/testinstall.cc deleted file mode 100644 index 40b7a8a..0000000 --- a/third_party/re2/testinstall.cc +++ /dev/null @@ -1,20 +0,0 @@ -#include <re2/re2.h> -#include <re2/filtered_re2.h> -#include <stdio.h> - -using namespace re2; - -int main(void) { - FilteredRE2 f; - int id; - f.Add("a.*b.*c", RE2::DefaultOptions, &id); - vector<string> v; - f.Compile(&v); - - if(RE2::FullMatch("axbyc", "a.*b.*c")) { - printf("PASS\n"); - return 0; - } - printf("FAIL\n"); - return 2; -} |