aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliseo Martínez <eliseomarmol@gmail.com>2014-05-12 15:54:04 +0200
committerEliseo Martínez <eliseomarmol@gmail.com>2014-05-15 20:46:02 +0200
commit74b9396043c36432f3b18aeab920a39f5092454c (patch)
tree21e3b15172ec8b4607e51573a37dece71b53fa17
parent762a8ad0f3dc93ff3d938f41af324620531b2923 (diff)
downloadrneovim-74b9396043c36432f3b18aeab920a39f5092454c.tar.gz
rneovim-74b9396043c36432f3b18aeab920a39f5092454c.tar.bz2
rneovim-74b9396043c36432f3b18aeab920a39f5092454c.zip
Introduce nvim namespace: Fix unit tests.
Point cimports to new locations.
-rw-r--r--test/unit/garray.moon2
-rw-r--r--test/unit/helpers.moon2
-rw-r--r--test/unit/os/env.moon2
-rw-r--r--test/unit/os/fs.moon2
-rw-r--r--test/unit/os/users.moon2
-rw-r--r--test/unit/path.moon2
6 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/garray.moon b/test/unit/garray.moon
index 2a1472e09c..245245e33b 100644
--- a/test/unit/garray.moon
+++ b/test/unit/garray.moon
@@ -1,6 +1,6 @@
{:cimport, :internalize, :eq, :neq, :ffi, :lib, :cstr, :to_cstr} = require 'test.unit.helpers'
-garray = cimport './src/garray.h'
+garray = cimport './src/nvim/garray.h'
-- handy constants
NULL = ffi.cast 'void*', 0
diff --git a/test/unit/helpers.moon b/test/unit/helpers.moon
index 8acbe8f992..84dfeb20e9 100644
--- a/test/unit/helpers.moon
+++ b/test/unit/helpers.moon
@@ -84,7 +84,7 @@ cimport = (...) ->
cppimport = (path) ->
return cimport Paths.test_include_path .. '/' .. path
-cimport './src/types.h'
+cimport './src/nvim/types.h'
-- take a pointer to a C-allocated string and return an interned
-- version while also freeing the memory
diff --git a/test/unit/os/env.moon b/test/unit/os/env.moon
index 4f2c45387e..545c1e84db 100644
--- a/test/unit/os/env.moon
+++ b/test/unit/os/env.moon
@@ -1,7 +1,7 @@
{:cimport, :internalize, :eq, :ffi, :lib, :cstr, :to_cstr} = require 'test.unit.helpers'
require 'lfs'
-env = cimport './src/os/os.h'
+env = cimport './src/nvim/os/os.h'
NULL = ffi.cast 'void*', 0
diff --git a/test/unit/os/fs.moon b/test/unit/os/fs.moon
index b11e2515bd..d4d82661a3 100644
--- a/test/unit/os/fs.moon
+++ b/test/unit/os/fs.moon
@@ -2,7 +2,7 @@
require 'lfs'
require 'bit'
-fs = cimport './src/os/os.h'
+fs = cimport './src/nvim/os/os.h'
-- TODO(aktau): define these constants "better"
FAIL = 0
diff --git a/test/unit/os/users.moon b/test/unit/os/users.moon
index 261d1a8763..d6b618eb8c 100644
--- a/test/unit/os/users.moon
+++ b/test/unit/os/users.moon
@@ -1,6 +1,6 @@
{:cimport, :internalize, :eq, :ffi, :lib, :cstr} = require 'test.unit.helpers'
-users = cimport './src/os/os.h', 'unistd.h'
+users = cimport './src/nvim/os/os.h', 'unistd.h'
NULL = ffi.cast 'void*', 0
OK = 1
diff --git a/test/unit/path.moon b/test/unit/path.moon
index 6aecdfe67c..20bef4071c 100644
--- a/test/unit/path.moon
+++ b/test/unit/path.moon
@@ -1,7 +1,7 @@
{:cimport, :internalize, :eq, :neq, :ffi, :lib, :cstr, :to_cstr} = require 'test.unit.helpers'
require 'lfs'
-path = cimport './src/path.h'
+path = cimport './src/nvim/path.h'
-- import constants parsed by ffi
{:kEqualFiles, :kDifferentFiles, :kBothFilesMissing, :kOneFileMissing, :kEqualFileNames} = path