patch 9.0.0028: MS-Windows: tests fail if there is a "runtime" directory
Problem: MS-Windows: tests fail if there is a stray "runtime" directory.
Solution: Only use a "runtime" directory if it contains "defaults.vim".
diff --git a/src/filepath.c b/src/filepath.c
index 854d823..f1ae18e 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -774,6 +774,26 @@
shorten_dir_len(str, 1);
}
+/*
+ * Return TRUE if "fname" is a readable file.
+ */
+ int
+file_is_readable(char_u *fname)
+{
+ int fd;
+
+#ifndef O_NONBLOCK
+# define O_NONBLOCK 0
+#endif
+ if (*fname && !mch_isdir(fname)
+ && (fd = mch_open((char *)fname, O_RDONLY | O_NONBLOCK, 0)) >= 0)
+ {
+ close(fd);
+ return TRUE;
+ }
+ return FALSE;
+}
+
#if defined(FEAT_EVAL) || defined(PROTO)
/*
@@ -894,26 +914,6 @@
}
/*
- * Return TRUE if "fname" is a readable file.
- */
- int
-file_is_readable(char_u *fname)
-{
- int fd;
-
-#ifndef O_NONBLOCK
-# define O_NONBLOCK 0
-#endif
- if (*fname && !mch_isdir(fname)
- && (fd = mch_open((char *)fname, O_RDONLY | O_NONBLOCK, 0)) >= 0)
- {
- close(fd);
- return TRUE;
- }
- return FALSE;
-}
-
-/*
* "filereadable()" function
*/
void
diff --git a/src/misc1.c b/src/misc1.c
index 91e208b..1ab3159 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1655,7 +1655,21 @@
vim_free(p);
p = concat_fnames(vimdir, (char_u *)RUNTIME_DIRNAME, TRUE);
if (p != NULL && mch_isdir(p))
- return p;
+ {
+ char_u *fname = concat_fnames(p, (char_u *)"defaults.vim", TRUE);
+
+ // Check that "defaults.vim" exists in this directory, to avoid picking
+ // up a stray "runtime" directory, it would make many tests fail in
+ // mysterious ways.
+ if (fname != NULL)
+ {
+ int exists = file_is_readable(fname);
+
+ vim_free(fname);
+ if (exists)
+ return p;
+ }
+ }
vim_free(p);
return NULL;
}
diff --git a/src/version.c b/src/version.c
index 4585915..77be61c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 28,
+/**/
27,
/**/
26,