aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2022-06-27 03:08:59 -0700
committerJustin M. Keyes <justinkz@gmail.com>2022-06-28 04:02:29 -0700
commitf05a2891d3da9f9fcd9c7457ca0c2a54ff65078b (patch)
treede382ef0008871d7e7a41b29172b41bd97a39e05 /test
parent9ddb481d88d3926111e83d512921ebe98bb426ae (diff)
downloadrneovim-f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b.tar.gz
rneovim-f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b.tar.bz2
rneovim-f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b.zip
build: rename build-related dirs
Problem: Dirs "config", "packaging", and "third-party" are all closely related but this is not obvious from the layout. This adds friction for new contributors. Solution: - rename config/ to cmake.config/ - rename test/config/ to test/cmakeconfig/ because it is used in Lua tests: require('test.cmakeconfig.paths'). - rename packaging/ to cmake.packaging/ - rename third-party/ to cmake.deps/ (parallel with .deps/)
Diffstat (limited to 'test')
-rw-r--r--test/cmakeconfig/paths.lua.in (renamed from test/config/paths.lua.in)0
-rw-r--r--test/functional/shada/shada_spec.lua2
-rw-r--r--test/helpers.lua2
-rwxr-xr-xtest/symbolic/klee/run.sh2
-rw-r--r--test/unit/helpers.lua2
5 files changed, 4 insertions, 4 deletions
diff --git a/test/config/paths.lua.in b/test/cmakeconfig/paths.lua.in
index e3979981ba..e3979981ba 100644
--- a/test/config/paths.lua.in
+++ b/test/cmakeconfig/paths.lua.in
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index ff63aed235..d10a2facbb 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -7,7 +7,7 @@ local write_file, spawn, set_session, nvim_prog, exc_exec =
helpers.exc_exec
local lfs = require('lfs')
-local paths = require('test.config.paths')
+local paths = require('test.cmakeconfig.paths')
local mpack = require('mpack')
diff --git a/test/helpers.lua b/test/helpers.lua
index a1c3dfacd2..9a77ca1956 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -4,7 +4,7 @@ local assert = require('luassert')
local luv = require('luv')
local lfs = require('lfs')
local relpath = require('pl.path').relpath
-local Paths = require('test.config.paths')
+local Paths = require('test.cmakeconfig.paths')
assert:set_parameter('TableFormatLevel', 100)
diff --git a/test/symbolic/klee/run.sh b/test/symbolic/klee/run.sh
index 0234a935b5..97ce42c31b 100755
--- a/test/symbolic/klee/run.sh
+++ b/test/symbolic/klee/run.sh
@@ -54,7 +54,7 @@ main() {
includes="$includes -I$PROJECT_SOURCE_DIR/src"
includes="$includes -I$PROJECT_BINARY_DIR/src/nvim/auto"
includes="$includes -I$PROJECT_BINARY_DIR/include"
- includes="$includes -I$PROJECT_BINARY_DIR/config"
+ includes="$includes -I$PROJECT_BINARY_DIR/cmake.config"
includes="$includes -I/host-includes"
local defines=
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 4dbcaa5347..29ea0235be 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -2,7 +2,7 @@ local ffi = require('ffi')
local formatc = require('test.unit.formatc')
local Set = require('test.unit.set')
local Preprocess = require('test.unit.preprocess')
-local Paths = require('test.config.paths')
+local Paths = require('test.cmakeconfig.paths')
local global_helpers = require('test.helpers')
local assert = require('luassert')
local say = require('say')