Build some more tests.

Change-Id: I98d55a8eb4511a80a26c866e1d1e0a8e0a19fa3c

5 files changed, 202 insertions, 21 deletions

diff --git a/cppu/meson.build b/cppu/meson.build
index 0c20029ef4bf..0ac31d2a86a1 100644
--- a/cppu/meson.build
+++ b/cppu/meson.build
@@ -27,3 +27,37 @@ cppu_lib = shared_library('cppulo',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
+
+test_unotype = shared_library('test_unotype',
+  'qa/test_unotype.cxx',
+  udk_fake_h,
+  cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+  include_directories: [main_inc, udkh_inc],
+  link_with: [cppu_lib, sal_lib],
+  dependencies: [cppunit_dep],
+)
+
+test('unotype', unittester,
+  args: [test_unotype])
+
+test_anyexternal = shared_library('test_anyexternal',
+  'qa/any-external.cxx',
+  udk_fake_h,
+  include_directories: [main_inc, udkh_inc],
+  link_with: [cppu_lib, sal_lib],
+  dependencies: [cppunit_dep],
+)
+
+test('unotype', unittester,
+  args: [test_anyexternal])
+
+#test_cppumaker = shared_library('test_cppumaker',
+#  'qa/cppumaker/test_cppumaker.cxx',
+#  udk_fake_h,
+#  include_directories: [main_inc, udkh_inc],
+#  link_with: [cppu_lib, sal_lib],
+#  dependencies: [cppunit_dep],
+#)
+
+#test('cppumaker', unittester,
+#  args: [test_cppumaker])
diff --git a/cppuhelper/meson.build b/cppuhelper/meson.build
index 28283fa72bc2..e49c8b970415 100644
--- a/cppuhelper/meson.build
+++ b/cppuhelper/meson.build
@@ -38,3 +38,51 @@ cppuhelper_lib = shared_library('cppuhelperlo',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
+
+test('ifcontainer', unittester,
+  args: [shared_library('test_ifcontainer',
+      'qa/ifcontainer/cppu_ifcontainer.cxx',
+      udk_fake_h,
+      include_directories: [main_inc, udkh_inc],
+      cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+      link_with: [cppu_lib, cppuhelper_lib, sal_lib],
+      dependencies: [cppunit_dep],
+    )
+  ]
+)
+
+test('unourl', unittester,
+  args: [shared_library('test_unourl',
+      'qa/unourl/cppu_unourl.cxx',
+      udk_fake_h,
+      include_directories: [main_inc, udkh_inc],
+      cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+      link_with: [cppu_lib, cppuhelper_lib, sal_lib],
+      dependencies: [cppunit_dep],
+    )
+  ]
+)
+
+test('cppumisc', unittester,
+  args: [shared_library('test_misc',
+      'qa/misc/test_misc.cxx',
+      udk_fake_h,
+      include_directories: [main_inc, udkh_inc],
+      cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+      link_with: [cppu_lib, cppuhelper_lib, sal_lib],
+      dependencies: [cppunit_dep],
+    )
+  ]
+)
+
+test('cppuweak', unittester,
+  args: [shared_library('test_cppuweak',
+      'qa/weak/test_weak.cxx',
+      udk_fake_h,
+      include_directories: [main_inc, udkh_inc],
+      cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+      link_with: [cppu_lib, cppuhelper_lib, sal_lib],
+      dependencies: [cppunit_dep],
+    )
+  ]
+)
diff --git a/i18nlangtag/meson.build b/i18nlangtag/meson.build
index b8a404e4b5ce..440ec7f98f6d 100644
--- a/i18nlangtag/meson.build
+++ b/i18nlangtag/meson.build
@@ -13,3 +13,15 @@ i18nlangtag_lib = shared_library('i18nlangtaglo',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
+
+test_langtag = shared_library('test_languagetag',
+  udk_fake_h, off_fake_h,
+  'qa/cppunit/test_languagetag.cxx',
+  cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+  link_with: [i18nlangtag_lib, sal_lib],
+  include_directories: [main_inc, udkh_inc, offapi_inc],
+  dependencies: [cppunit_dep],
+)
+
+test('languagetag', unittester,
+   args: [test_langtag])
diff --git a/sal/meson.build b/sal/meson.build
index 621685f1cd5d..88ac39c772e6 100644
--- a/sal/meson.build
+++ b/sal/meson.build
@@ -100,28 +100,15 @@ sal_lib = shared_library('sallo',
   'osl/all/log.cxx',
   'osl/all/signalshared.cxx',
   'osl/all/utility.cxx',
-  system_sources,
-  'textenc/context.cxx',
-  'textenc/convertbig5hkscs.cxx',
   'textenc/converter.cxx',
-  'textenc/converteuctw.cxx',
-  'textenc/convertgb18030.cxx',
-  'textenc/convertisciidevangari.cxx',
-  'textenc/convertiso2022cn.cxx',
-  'textenc/convertiso2022jp.cxx',
-  'textenc/convertiso2022kr.cxx',
   'textenc/convertsimple.cxx',
-  'textenc/convertsinglebytetobmpunicode.cxx',
   'textenc/handleundefinedunicodetotextchar.cxx',
-  'textenc/tables.cxx',
-  'textenc/tcvtbyte.cxx',
-  'textenc/tcvtmb.cxx',
-  'textenc/tcvtutf7.cxx',
   'textenc/tcvtutf8.cxx',
   'textenc/tencinfo.cxx',
   'textenc/textcvt.cxx',
   'textenc/textenc.cxx',
   'textenc/unichars.cxx',
+  system_sources,
   include_directories: [main_inc, 'inc'],
   cpp_args: ['-DSRCDIR="@0@"'.format(meson.current_source_dir()),
              '-DRTL_OS="@0@"'.format(rtl_os),
@@ -134,6 +121,28 @@ sal_lib = shared_library('sallo',
   install: true,
 )
 
+sal_textenc_lib = shared_library('sal_textenc',
+  'textenc/context.cxx',
+  'textenc/convertbig5hkscs.cxx',
+  'textenc/converteuctw.cxx',
+  'textenc/convertgb18030.cxx',
+  'textenc/convertisciidevangari.cxx',
+  'textenc/convertiso2022cn.cxx',
+  'textenc/convertiso2022jp.cxx',
+  'textenc/convertiso2022kr.cxx',
+  'textenc/convertsinglebytetobmpunicode.cxx',
+  'textenc/tables.cxx',
+  'textenc/tcvtbyte.cxx',
+  'textenc/tcvtmb.cxx',
+  'textenc/tcvtutf7.cxx',
+  include_directories: [main_inc, 'inc'],
+  cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+  link_args: system_link_args,
+  link_with: [sal_lib],
+  dependencies: [thread_dep],
+  install: true,
+)
+
 if cppunit_dep.found()
 
   unittester = executable('cppunittester', 'cppunittester/cppunittester.cxx',
@@ -144,8 +153,25 @@ if cppunit_dep.found()
   install: true,
     )
 
-  plib = shared_library('osl_test',
-    'qa/osl/thread/test_thread.cxx',
+  shared_library('test_Module_DLL',
+    'qa/osl/module/osl_Module_DLL.cxx',
+    include_directories: [main_inc],
+    dependencies: [cppunit_dep],
+  )
+
+  osltestlib = shared_library('osl_test',
+    'qa/osl/condition/osl_Condition.cxx',
+    #'qa/osl/file/osl_File.cxx',
+    'qa/osl/file/osl_old_test_file.cxx',
+    'qa/osl/file/test_cpy_wrt_file.cxx',
+    'qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx',
+    'qa/osl/module/osl_Module.cxx',
+    'qa/osl/mutex/osl_Mutex.cxx',
+    'qa/osl/pipe/osl_Pipe.cxx',
+    'qa/osl/process/osl_process.cxx',
+    'qa/osl/process/osl_Thread.cxx',
+    'qa/osl/profile/osl_old_testprofile.cxx',
+    'qa/osl/setthreadname/test-setthreadname.cxx',
     cpp_args:  ['-DLIBO_INTERNAL_ONLY'],
     link_with: sal_lib,
     dependencies: [cppunit_dep, thread_dep],
@@ -153,12 +179,63 @@ if cppunit_dep.found()
     install: true,
   )
 
-  test('sal_test', unittester,
-    args: [plib])
+  test('osl_test', unittester,
+    args: [osltestlib])
+
+  test_saltypes = shared_library('test_sal_types',
+    'qa/sal/test_types.cxx',
+    include_directories: [main_inc],
+    dependencies: [cppunit_dep],
+  )
 
-  #pc = executable('process_child', 'qa/osl/process/osl_process_child.cxx',
-  #  dependencies: []
-  #)
+  test('saltypes', unittester,
+    args: [test_saltypes])
+
+  rtltestlib = shared_library('rtl_test',
+    'qa/ByteSequence/ByteSequence.cxx',
+    'qa/OStringBuffer/rtl_OStringBuffer.cxx',
+    'qa/rtl/alloc/rtl_alloc.cxx',
+    'qa/rtl/bootstrap/expand.cxx',
+    'qa/rtl/cipher/rtl_cipher.cxx',
+    'qa/rtl/crc32/rtl_crc32.cxx',
+    'qa/rtl/digest/rtl_digest.cxx',
+    'qa/rtl/doublelock/rtl_doublelocking.cxx',
+    'qa/rtl/locale/rtl_locale.cxx',
+    'qa/rtl/math/test-rtl-math.cxx',
+    'qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx',
+    'qa/rtl/oustringbuffer/test_oustringbuffer_appenduninitialized.cxx',
+    'qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx',
+    'qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx',
+    'qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx',
+    'qa/rtl/oustring/rtl_OUString2.cxx',
+    'qa/rtl/process/rtl_Process.cxx',
+    'qa/rtl/random/rtl_random.cxx',
+    'qa/rtl/ref/rtl_ref.cxx',
+    'qa/rtl/strings/test_strings_replace.cxx',
+    'qa/rtl/strings/test_ostring.cxx',
+    'qa/rtl/strings/test_ostring_concat.cxx',
+    'qa/rtl/strings/test_ostring_stringliterals.cxx',
+    'qa/rtl/strings/test_oustring_compare.cxx',
+    'qa/rtl/strings/test_oustring_concat.cxx',
+    'qa/rtl/strings/test_oustring_convert.cxx',
+    'qa/rtl/strings/test_oustring_endswith.cxx',
+    'qa/rtl/strings/test_oustring_startswith.cxx',
+    'qa/rtl/strings/test_oustring_stringliterals.cxx',
+    'qa/rtl/strings/test_strings_toint.cxx',
+    'qa/rtl/strings/test_strings_valuex.cxx',
+    'qa/rtl/textenc/rtl_tencinfo.cxx',
+    'qa/rtl/textenc/rtl_textcvt.cxx',
+    'qa/rtl/uri/rtl_Uri.cxx',
+    'qa/rtl/uri/rtl_testuri.cxx',
+    'qa/rtl/uuid/rtl_Uuid.cxx',
+    cpp_args: ['-DLIBO_INTERNAL_ONLY'],
+    include_directories: [main_inc, 'qa/inc'],
+    link_with: [sal_lib],
+    dependencies: [cppunit_dep],
+  )
+
+  test('rtl_test', unittester,
+    args: [rtltestlib])
 
   test('osl_security', executable('osl_security', 'qa/osl/security/osl_Security.cxx',
       include_directories: [main_inc],
@@ -169,3 +246,4 @@ if cppunit_dep.found()
     )
   )
 endif
+
diff --git a/salhelper/meson.build b/salhelper/meson.build
index 45fae60be0de..8e9e4b007e79 100644
--- a/salhelper/meson.build
+++ b/salhelper/meson.build
@@ -12,3 +12,12 @@ salhelper_lib = shared_library('salhelperlo',
   install: true,
 )
 
+sh_test = shared_library('test_salhelper',
+  'qa/test_api.cxx',
+  include_directories: [main_inc],
+  link_with: [salhelper_lib, sal_lib],
+  dependencies: [cppunit_dep],
+)
+
+test('salhelper', unittester,
+    args: [sh_test])