aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Wienecke <wienecke.t@gmail.com>2014-03-06 14:29:18 +0100
committerThiago de Arruda <tpadilha84@gmail.com>2014-03-07 17:30:39 -0300
commitef03a8c52accf4180b48630cb66aef92d3c3ce78 (patch)
tree7dedda62643a3dcd8f37b33cc46ba472a6c21061
parentd5b223afe22b0809e4718749a3cdc40ceb5434dd (diff)
downloadrneovim-ef03a8c52accf4180b48630cb66aef92d3c3ce78.tar.gz
rneovim-ef03a8c52accf4180b48630cb66aef92d3c3ce78.tar.bz2
rneovim-ef03a8c52accf4180b48630cb66aef92d3c3ce78.zip
Declare is_executable as static and remove its unit tests.
Testing the public interface mch_can_exe should suffice. Every former test of is_executable has a counterpart in the tests of mch_can_exe. Thus we can keep private things private.
-rw-r--r--src/os/fs.c4
-rw-r--r--test/unit/os_unix.moon23
2 files changed, 5 insertions, 22 deletions
diff --git a/src/os/fs.c b/src/os/fs.c
index a1e3cd2899..fc9624dd90 100644
--- a/src/os/fs.c
+++ b/src/os/fs.c
@@ -192,12 +192,12 @@ int mch_isdir(char_u *name)
return TRUE;
}
-int is_executable(char_u *name);
+static int is_executable(char_u *name);
/*
* Return 1 if "name" is an executable file, 0 if not or it doesn't exist.
*/
-int is_executable(char_u *name)
+static int is_executable(char_u *name)
{
uv_fs_t request;
if (0 != uv_fs_stat(uv_default_loop(), &request, (const char*) name, NULL)) {
diff --git a/test/unit/os_unix.moon b/test/unit/os_unix.moon
index 09505235d7..6e986de44f 100644
--- a/test/unit/os_unix.moon
+++ b/test/unit/os_unix.moon
@@ -55,26 +55,6 @@ describe 'os_unix function', ->
it 'returns true if an arbitrary directory is given', ->
eq TRUE, (mch_isdir 'unit-test-directory')
- describe 'is_executable', ->
- is_executable = (name) ->
- name = cstr (string.len name), name
- os.is_executable name
-
- it 'returns false when given a directory', ->
- eq FALSE, (is_executable 'unit-test-directory')
-
- it 'returns false when the given file does not exists', ->
- eq FALSE, (is_executable 'does-not-exist.file')
-
- it 'returns true when given an executable regular file', ->
- eq TRUE, (is_executable absolute_executable)
-
- it 'returns false when given a regular file without executable bit set', ->
- -- This is a critical test since Windows does not have any executable
- -- bit. Thus is_executable returns TRUE on every regular file on
- -- Windows and this test will fail.
- eq FALSE, (is_executable 'unit-test-directory/test.file')
-
describe 'mch_can_exe', ->
mch_can_exe = (name) ->
name = cstr (string.len name), name
@@ -83,6 +63,9 @@ describe 'os_unix function', ->
it 'returns false when given a directory', ->
eq FALSE, (mch_can_exe './unit-test-directory')
+ it 'returns false when given a regular file without executable bit set', ->
+ eq FALSE, (mch_can_exe 'unit-test-directory/test.file')
+
it 'returns false when the given file does not exists', ->
eq FALSE, (mch_can_exe 'does-not-exist.file')