Merge branch 'wt/rename' into api-hardening

# Conflicts:
#	README.md

1 files changed, 25 insertions, 25 deletions

diff --git a/tests/meson.build b/tests/meson.build
index 04dab9a..f176a6e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -12,7 +12,7 @@ test_env.set('DYLD_INSERT_LIBRARIES', '')
 test_env.set('NM', find_program('nm', native: true).full_path())
 
 # [name, sources, dependencies, suites]
-term_tests = [
+wsap_vtcore_tests = [
   ['unicode-test', files('unicode/unicode_test.c'), [], []],
   ['term-input-test', files('input_test.c'), [], []],
   ['term-test', files('term_test.c'), [thread_dep], ['isa']],
@@ -33,14 +33,14 @@ term_tests = [
 ]
 test_helpers_inc = include_directories('helpers')
 
-term_test_exes = {}
-foreach entry : term_tests
+wsap_vtcore_test_exes = {}
+foreach entry : wsap_vtcore_tests
   exe = executable(entry[0], entry[1],
     c_args: test_c_args,
     include_directories: test_helpers_inc,
-    dependencies: [term_internal_dep] + entry[2],
+    dependencies: [wsap_vtcore_internal_dep] + entry[2],
   )
-  term_test_exes += {entry[0]: exe}
+  wsap_vtcore_test_exes += {entry[0]: exe}
   test(entry[0], exe,
     args: entry[0] == 'write-fuzz-test' ? [get_option('write_fuzz_seeds').to_string()] : [],
     env: test_env,
@@ -55,40 +55,40 @@ if host_machine.cpu_family() == 'x86_64' and cc.get_argument_syntax() == 'gcc' a
     cc.get_define('__AVX2__', args: get_option('arch_flag') != '' ? [get_option('arch_flag')] : []) == ''
   foreach level : ['base', 'avx2']
     level_env = test_env
-    level_env.set('TERM_HEADLESS_ISA', level)
+    level_env.set('WSAP_VTCORE_ISA', level)
     foreach name : ['term-test', 'spec-test', 'model-test', 'view-test', 'term-input-test',
                     'hist-test', 'history-text-test']
-      test(name + '-' + level, term_test_exes[name], env: level_env,
+      test(name + '-' + level, wsap_vtcore_test_exes[name], env: level_env,
         suite: ['unit', 'isa'], timeout: 180)
     endforeach
   endforeach
 endif
 
-# The amalgamation is the core as one term.c, the way a host builds it. The
-# tests that use only term.h run again against it.
-term_amalgamation = custom_target(
+# The amalgamation is the core as one wsap_vtcore.c, the way a host builds
+# it. The tests that use only wsap_vtcore.h run again against it.
+wsap_vtcore_amalgamation = custom_target(
   'term-amalgamation',
-  output: ['term.c', 'term.h'],
+  output: ['wsap_vtcore.c', 'wsap_vtcore.h'],
   depfile: 'term-amalgamation.d',
   command: [python, files('../tools/amalgamate.py'),
             meson.project_source_root(), '@OUTDIR@', '@DEPFILE@'],
 )
-term_amalgamation_lib = static_library(
+wsap_vtcore_amalgamation_lib = static_library(
   'term-amalgamation',
-  term_amalgamation[0],
+  wsap_vtcore_amalgamation[0],
   dependencies: [m_dep, thread_dep],
   override_options: ['c_std=c11', 'warning_level=3', 'werror=true'],
   build_by_default: false,
 )
-foreach entry : term_tests
+foreach entry : wsap_vtcore_tests
   if entry[0] in ['term-test', 'spec-test', 'view-test', 'dcs-test', 'osc-test',
                   'history-text-test', 'term-input-test', 'model-test', 'model-row-test',
                   'resize-property-test', 'api-args-test']
     test(entry[0] + '-amalgamation',
       executable(entry[0] + '-amalgamation', entry[1],
         c_args: test_c_args,
-        include_directories: [term_inc, test_helpers_inc],
-        link_with: term_amalgamation_lib,
+        include_directories: [wsap_vtcore_inc, test_helpers_inc],
+        link_with: wsap_vtcore_amalgamation_lib,
         dependencies: [m_dep, thread_dep] + entry[2],
         build_by_default: false),
       env: test_env, suite: ['unit', 'amalgamation'], timeout: 180)
@@ -96,9 +96,9 @@ foreach entry : term_tests
 endforeach
 
 test('term-symbols-test', bash,
-  args: [files('symbols_test.sh'), term_lib.get_static_lib(),
-         meson.project_source_root() / 'include' / 'term',
-         term_lib.get_shared_lib()],
+  args: [files('symbols_test.sh'), wsap_vtcore_lib.get_static_lib(),
+         meson.project_source_root() / 'include' / 'wsap_vtcore',
+         wsap_vtcore_lib.get_shared_lib()],
   env: test_env,
   suite: 'unit',
 )
@@ -110,7 +110,7 @@ if cc.has_link_argument('-Wl,--wrap=realloc') and cc.has_link_argument('-Wl,--wr
   snapshot_failure_test = executable('snapshot-failure-test', 'snapshot_failure_test.c',
     c_args: test_c_args,
     link_args: ['-Wl,--wrap=realloc', '-Wl,--wrap=malloc'],
-    dependencies: [term_internal_dep],
+    dependencies: [wsap_vtcore_internal_dep],
   )
   test('snapshot-failure-test', snapshot_failure_test,
     env: test_env,
@@ -121,8 +121,8 @@ endif
 # The project version comes in as a define, so the header macros cannot
 # drift from meson.build.
 version_test = executable('version-test', 'version_test.c',
-  c_args: test_c_args + ['-DTERM_TEST_PROJECT_VERSION="@0@"'.format(meson.project_version())],
-  dependencies: [term_internal_dep],
+  c_args: test_c_args + ['-DWSAP_VTCORE_TEST_PROJECT_VERSION="@0@"'.format(meson.project_version())],
+  dependencies: [wsap_vtcore_internal_dep],
 )
 test('version-test', version_test,
   env: test_env,
@@ -140,10 +140,10 @@ kitty_tests = get_option('kitty').require(
   host_machine.system() == 'linux' and get_option('b_sanitize') == 'none',
   error_message: 'The Kitty tests need an unsanitized Linux build',
 )
-term_kitty_tests = kitty_tests.allowed()
-if term_kitty_tests
+wsap_vtcore_kitty_tests = kitty_tests.allowed()
+if wsap_vtcore_kitty_tests
   kitty_bridge = shared_library('kitty_bridge', 'extern/kitty/screen_bridge.c',
-    dependencies: term_internal_dep,
+    dependencies: wsap_vtcore_internal_dep,
   )
   kitty_env = environment()
   kitty_env.set('WSAP_KITTY_LIB', kitty_bridge.full_path())