Hi Bram!
On Fr, 19 Feb 2016, Bram Moolenaar wrote:
>
> Christian Brabandt wrote:
>
> > On Do, 18 Feb 2016, Bram Moolenaar wrote:
> >
> > > Christian Brabandt wrote:
> > > > On Mi, 17 Feb 2016, Bram Moolenaar wrote:
> > > >
> > > > > Thanks. I think we should also build a console version. Since
> > > > > testing
> > > > > appears to the take bulk of the time we can run the tests once with
> > > > > HUGE-console features. So perhaps we can build TINY-console with MSVC
> > > > > and HUGE-console with MingW and then run the tests with the MingW
> > > > > binary? That way we cover more rows & columns in the build & test
> > > > > matrix.
> > > >
> > > > Well, a console version is build for MSVC, since that appears to build
> > > > faster than MingW. Testing happens with the gvim.exe build from MSVC,
> > > > because first of all, the test I tried with MingW did stall on test47
> > > > and second of all, last time I checked with the nightly windows builds,
> > > > the gui version test was a lot faster than the console test.
> > >
> > > Running the tests in the console is different from running them in the
> > > GUI, I think we should run both.
> >
> > Okay, we can do this. Will take longer however.
>
> I'm glad you are taking the time to make this work. Pity it's not that
> easy. I see the current version still fails in some ways it would not
> fail when run locally.
Yes, I saw some test failures for the console version. Attached patch
appveyor_test_fixes.diff fixes those warnings (basically by making sure,
that VIMRUNTIME is defined) and disables 2 tests, for which I couldn't
find out, why they failed.
Also, this patch fixes a warning about an uninitialized variable in
f_tan()
> It appears to get stuck in "windres". Perhaps it's showing a dialog and
> wants you to click OK. Hmm, the "Leaving directory" indicates that
> windres finished, thus it must be something else.
>
> The tiny build should probably not build GvimExt. And the console
> version should not build it either.
Hm, I don't know how to disable this. However, I left out the tiny
version and the current version only builds normal and huge versions as
requested.
Attached patch appveyor_test_matrix does that.
Best,
Christian
--
Daß uns der Anblick der Tiere so ergötzt, beruht hauptsächlich darauf,
daß es uns freut, unser eigenes Wesen so vereinfacht vor uns zu sehn.
-- Arthur Schopenhauer
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
commit 5f8fe95b96c5f4f3cd791d51e319ad328d8647d9
Author: Christian Brabandt <[email protected]>
Date: Sun Feb 21 10:45:09 2016 +0100
slight changes to tests
set vimruntime directory
fix mingw warning about uninitialized variable in a_tan() function
fix test_options to always find $VIMRUNTIME/optwin.vim
diff --git a/src/eval.c b/src/eval.c
index bb9a4c5..2cb46c4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9489,7 +9489,7 @@ f_asin(typval_T *argvars, typval_T *rettv)
static void
f_atan(typval_T *argvars, typval_T *rettv)
{
- float_T f;
+ float_T f = 0.0;
rettv->v_type = VAR_FLOAT;
if (get_float_arg(argvars, &f) == OK)
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index bb92904..93c9f24 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -15,7 +15,6 @@ SCRIPTS_ALL = \
test7.out \
test8.out \
test9.out \
- test13.out \
test14.out \
test15.out \
test18.out \
@@ -104,7 +103,6 @@ SCRIPTS_ALL = \
test_insertcount.out \
test_listchars.out \
test_listlbr.out \
- test_listlbr_utf8.out \
test_mapping.out \
test_marks.out \
test_match_conceal.out \
@@ -135,9 +133,12 @@ SCRIPTS_MORE2 = \
test2.out \
test10.out \
test12.out \
+ test13.out \
+ test_listlbr_utf8.out \
test25.out \
test49.out \
- test97.out
+ test97.out \
+ test_listlbr_utf8.out
# Tests that run on most systems, but not MingW and Cygwin.
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 3073e9e..ec46d9b 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -114,4 +114,4 @@ bench_re_freeze.out: bench_re_freeze.vim
newtests: $(NEW_TESTS)
.vim.res:
- $(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim
+ set VIMRUNTIME=..\..\runtime && $(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim
diff --git a/src/testdir/test_options.in b/src/testdir/test_options.in
index 6e56fa2..b3e0fa9 100644
--- a/src/testdir/test_options.in
+++ b/src/testdir/test_options.in
@@ -3,6 +3,8 @@ Test for ":options".
STARTTEST
:so small.vim
:let caught = 'ok'
+:" Make sure, VIMRUNTIME is defined
+:let $VIMRUNTIME=expand("%:p:h").'/../../runtime'
:try
:options
:catch
commit d35f970c8ea99659177e5a5925a1e692a7e3c57b
Author: Christian Brabandt <[email protected]>
Date: Mon Feb 15 20:21:59 2016 +0100
updated appveyor script
diff --git a/appveyor.yml b/appveyor.yml
index ab379f9..934f785 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,20 +1,32 @@
version: "{build}"
-skip_tags: true
+environment:
+ matrix:
+ - FEATURE: HUGE
+ - FEATURE: NORMAL
+# disabled
+# - FEATURE: TINY
+# - FEATURE: SMALL
+# - FEATURE: BIG
+
+matrix:
+ fast_finish: true
before_build:
- '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
- # Work around for Python 2.7.11's bug
+# Work around for Python 2.7.11
- reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:32
- reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:64
build_script:
- - cd src
- - sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
- - nmake -f Make_mvc2.mak CPU=AMD64 GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64
- - .\gvim -u NONE -c "redir @a | ver | 0put a | wq!" ver.txt
- - type ver.txt
+ - src/appveyor.bat
test_script:
- - cd testdir
+ - cd src/testdir
+ # Testing with MSVC gvim
- nmake -f Make_dos.mak VIMPROG=..\gvim
+ - nmake -f Make_dos.mak clean
+ # Testing with MingW console version
+ - nmake -f Make_dos.mak VIMPROG=vim
+
+# vim: sw=2 sts=2 et ts=2 sr
diff --git a/src/appveyor.bat b/src/appveyor.bat
new file mode 100644
index 0000000..74615f9
--- /dev/null
+++ b/src/appveyor.bat
@@ -0,0 +1,40 @@
+@echo off
+:: Batch file for building/testing Vim on AppVeyor
+
+setlocal ENABLEDELAYEDEXPANSION
+cd %APPVEYOR_BUILD_FOLDER%
+
+cd src
+echo "Building MinGW 32bit Version"
+:: Build Mingw version, 1)console version, 2) gvim version
+set PATH=c:\msys64\mingw32\bin;%PATH%
+mingw32-make.exe -f Make_ming.mak GUI=no OPTIMIZE=speed IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
+copy vim.exe testdir
+mingw32-make.exe -f Make_ming.mak clean
+:: build huge version with python and channel support
+if "%FEATURE%" == "HUGE" (
+ mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed CHANNEL=yes GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34 FEATURES=%FEATURE% || exit 1
+) ELSE (
+ mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
+)
+.\gvim -u NONE -c "redir @a | ver |0put a | wq!" ver_ming.txt
+:: Build MSVC Version
+echo "Building MSVC 64bit Version"
+sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
+nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=no IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
+nmake -f Make_mvc2.mak clean
+:: build huge version with python and channel support
+:: GUI needs to be last, to that testing works
+if "%FEATURE%" == "HUGE" (
+ nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64 FEATURES=%FEATURE% || exit 1
+) ELSE (
+ nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
+)
+.\gvim -u NONE -c "redir @a | ver |0put a | wq!" ver_msvc.txt
+echo "version output MinGW"
+type ver_ming.txt
+echo "version output MVC"
+type ver_msvc.txt
+cd ..
+
+:eof
