Delta Between Two Patch Sets: meson.build
Issue 29680720:
Issue 6221 - Add native tests. (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Changes from review.
Created Jan. 27, 2018, 3:33 a.m.
Right Patch Set: Review comments addressed
Created Jan. 29, 2018, 4:56 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« dependencies ('k')
|
test/compiled/RegExp.cpp » ('j')
|
test/compiled/RegExp.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') | 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') |
| 2 | 2 |
| 3 native = get_option('native') | 3 native = get_option('native') |
| 4 if native | 4 if native |
| 5 target_type='native' | 5 target_type='native' |
| 6 else | 6 else |
| 7 target_type='js' | 7 target_type='js' |
| 8 endif | 8 endif |
| 9 | 9 |
| 10 if target_type == 'js' | 10 if target_type == 'js' |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 'compiled/filter/ElemHideException.cpp', | 80 'compiled/filter/ElemHideException.cpp', |
| 81 'compiled/filter/ElemHideFilter.cpp', | 81 'compiled/filter/ElemHideFilter.cpp', |
| 82 'compiled/filter/Filter.cpp', | 82 'compiled/filter/Filter.cpp', |
| 83 'compiled/filter/InvalidFilter.cpp', | 83 'compiled/filter/InvalidFilter.cpp', |
| 84 'compiled/filter/RegExpFilter.cpp', | 84 'compiled/filter/RegExpFilter.cpp', |
| 85 'compiled/filter/WhitelistFilter.cpp', | 85 'compiled/filter/WhitelistFilter.cpp', |
| 86 'compiled/storage/FilterStorage.cpp', | 86 'compiled/storage/FilterStorage.cpp', |
| 87 'compiled/subscription/DownloadableSubscription.cpp', | 87 'compiled/subscription/DownloadableSubscription.cpp', |
| 88 'compiled/subscription/Subscription.cpp', | 88 'compiled/subscription/Subscription.cpp', |
| 89 'compiled/subscription/UserDefinedSubscription.cpp', | 89 'compiled/subscription/UserDefinedSubscription.cpp', |
| 90 'compiled/Base64.cpp', | |
| 91 'compiled/ElemHide.cpp', | 90 'compiled/ElemHide.cpp', |
| 92 'compiled/ElemHideEmulation.cpp', | |
| 93 'compiled/Md5.cpp', | |
| 94 'compiled/String.cpp', | |
| 95 ] | 91 ] |
| 96 # sources specific to core | 92 # sources specific to core |
| 97 core_sources = [ | 93 core_sources = [ |
| 98 'compiled/traceInit.cpp', | 94 'compiled/traceInit.cpp', |
| 99 ] | 95 ] |
| 100 # sources for the bindings generator | 96 # sources for the bindings generator |
| 101 bindings_sources = [ | 97 bindings_sources = [ |
| 102 'compiled/bindings/generator.cpp', | 98 'compiled/bindings/generator.cpp', |
| 103 'compiled/bindings/main.cpp', | 99 'compiled/bindings/main.cpp', |
| 104 ] | 100 ] |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 ], | 217 ], |
| 222 cpp_args: GTEST_PARAMS) | 218 cpp_args: GTEST_PARAMS) |
| 223 abptest = executable('abptest', test_sources, | 219 abptest = executable('abptest', test_sources, |
| 224 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, | 220 cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS, |
| 225 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), | 221 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), |
| 226 link_args: LINK_PARAMS, | 222 link_args: LINK_PARAMS, |
| 227 link_with: [ adblockpluscore, gtest ]) | 223 link_with: [ adblockpluscore, gtest ]) |
| 228 test('abptest', abptest) | 224 test('abptest', abptest) |
| 229 endif | 225 endif |
| 230 | 226 |
| LEFT | RIGHT |
« dependencies ('k')
|
test/compiled/RegExp.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
