Issue 6221 - Add native tests.

meson.build

 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0')
 
 native = get_option('native')
 if native
    target_type='native'
 else
    target_type='js'
 endif
 
 if target_type == 'js'
@@ skipping 69 matching lines @@
   'compiled/filter/ElemHideException.cpp',
   'compiled/filter/ElemHideFilter.cpp',
   'compiled/filter/Filter.cpp',
   'compiled/filter/InvalidFilter.cpp',
   'compiled/filter/RegExpFilter.cpp',
   'compiled/filter/WhitelistFilter.cpp',
   'compiled/storage/FilterStorage.cpp',
   'compiled/subscription/DownloadableSubscription.cpp',
   'compiled/subscription/Subscription.cpp',
   'compiled/subscription/UserDefinedSubscription.cpp',
-  'compiled/Base64.cpp',
   'compiled/ElemHide.cpp',
-  'compiled/ElemHideEmulation.cpp',
-  'compiled/Md5.cpp',
-  'compiled/String.cpp',
 ]
 # sources specific to core
 core_sources = [
   'compiled/traceInit.cpp',
 ]
 # sources for the bindings generator
 bindings_sources = [
   'compiled/bindings/generator.cpp',
   'compiled/bindings/main.cpp',
 ]
@@ skipping 84 matching lines @@
                                   input: core_objects + shared_objects,
                                   output: COMPILER_OUTPUT,
                                   depend_files: [ JS_LIBRARY ],
                                   command: [
                                     emcc, '-o', output_file,
                                     '--post-js', bindings_output,
                                     '--js-library', JS_LIBRARY,
                                     '@INPUT@'
                                   ] + compiler_args + optional_args)
 else
-  GTEST_DIR = join_paths(meson.source_root(), 'third-party', 'googletest', 'googletest')
+  GTEST_DIR = join_paths('third-party', 'googletest', 'googletest')
+  GTEST_PARAMS = []
+  compiler = meson.get_compiler('cpp')
+  if compiler.has_argument('-pthread')
+    GTEST_PARAMS += '-pthread'
+  endif
 
   test_sources = [
     'test/compiled/abptest.cpp',
     'test/compiled/String.cpp',
     'test/compiled/StringMap.cpp',
+    'test/compiled/RegExp.cpp',
   ]
 
   adblockpluscore = library('adblockpluscore', shared_sources,
                             native_sources,
                             cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS,
                             link_args: LINK_PARAMS)
   gtest = static_library('gtest', files(join_paths(GTEST_DIR, 'src', 'gtest-all.cc')),
-                         cpp_args: [ '-isystem', join_paths(GTEST_DIR, 'include'),

[sergei, 2018/01/26 22:13:36]

I'm afraid isystem is not supported on windows, but we can add a branch here
later I guess, or even fix in meson.

For -pthread there should be a branch, can be done later too.

[hub, 2018/01/27 03:33:37]

I have reworked this part. I use the meson syntax to specify includes, it should
work everywhere.

-                                     '-I' + GTEST_DIR, '-pthread' ])
+                         include_directories: [
+                             include_directories(join_paths(GTEST_DIR, 'include'), is_system: true),
+                             include_directories(GTEST_DIR)
+                         ],
+                         cpp_args: GTEST_PARAMS)
   abptest = executable('abptest', test_sources,
-                       cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS +
-                                 [
-                                   '-I' + join_paths(GTEST_DIR, 'include'),
-                                 ],
+                       cpp_args: ADDITIONAL_PARAMS + CORE_PARAMS,
+                       include_directories: include_directories(join_paths(GTEST_DIR, 'include')),
                        link_args: LINK_PARAMS,
                        link_with: [ adblockpluscore, gtest ])
   test('abptest', abptest)
 endif