[RFC] Getting exit status from job with job-control

.ci/clang.sh

@@ -0,0 +1,60 @@
+. "$CI_SCRIPTS/common.sh"
+
+sudo pip install cpp-coveralls
+
+# Use custom Clang and enable ASAN on Linux.
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+	clang_version=3.4.2
+	clang_suffix=x86_64-unknown-ubuntu12.04.xz
+	if [ ! -d /usr/local/clang-$clang_version ]; then
+		echo "Downloading clang $clang_version..."
+		sudo mkdir /usr/local/clang-$clang_version
+		wget -q -O - http://llvm.org/releases/$clang_version/clang+llvm-$clang_version-$clang_suffix \
+			| sudo tar xJf - --strip-components=1 -C /usr/local/clang-$clang_version
+	fi
+	export CC=/usr/local/clang-$clang_version/bin/clang
+	symbolizer=/usr/local/clang-$clang_version/bin/llvm-symbolizer
+	export ASAN_SYMBOLIZER_PATH=$symbolizer
+	export ASAN_OPTIONS="detect_leaks=1:log_path=$tmpdir/asan"
+	export TSAN_OPTIONS="external_symbolizer_path=$symbolizer:log_path=$tmpdir/tsan"
+	export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works
+	CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \
+		-DUSE_GCOV=ON \
+		-DBUSTED_OUTPUT_TYPE=plainTerminal \
+		-DSANITIZE=ON"
+else
+	CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \
+		-DUSE_GCOV=ON \
+		-DBUSTED_OUTPUT_TYPE=plainTerminal"
+fi
+
+setup_deps x64
+
+# Build and output version info.
+$MAKE_CMD CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS" nvim
+build/bin/nvim --version
+
+# Run unittests.
+make unittest
+
+# Run functional tests.
+if ! $MAKE_CMD test; then
+	asan_check "$tmpdir"
+	exit 1
+fi
+asan_check "$tmpdir"
+
+# Run legacy tests.
+if ! $MAKE_CMD oldtest; then
+	reset
+	asan_check "$tmpdir"
+	exit 1
+fi
+asan_check "$tmpdir"
+
+coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.'
+
+# Test if correctly installed.
+sudo -E $MAKE_CMD install
+/usr/local/bin/nvim --version
+/usr/local/bin/nvim -e -c "quit"

.ci/common.sh

@@ -30,22 +30,25 @@ check_core_dumps() {
 	sleep 2
 
 	if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-		cores=/cores/*
+		cores="$(find /cores/ -type f -print)"
+		dbg="lldb -Q -o bt -f build/bin/nvim -c"
 	else
 		# TODO(fwalch): Will trigger if a file named core.* exists outside of .deps.
-		cores="$(find ./ -not -path '*.deps*' -name 'core.*' -print)"
+		cores="$(find ./ -type f -not -path '*.deps*' -name 'core.*' -print)"
+		dbg="gdb -n -batch -ex bt build/bin/nvim"
 	fi
 
 	if [ -z "$cores" ]; then
 		return
 	fi
 	for c in $cores; do
-		gdb -q -n -batch -ex bt build/bin/nvim $c
+		$dbg $c
 	done
 	exit 1
 }
 
 setup_deps() {
+	sudo pip install neovim
 	if [ "$BUILD_NVIM_DEPS" != "true" ]; then
 		eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) deps-${1}"
 	elif [ "$TRAVIS_OS_NAME" = "linux" ]; then

.ci/gcc.sh

@@ -4,17 +4,12 @@ sudo pip install cpp-coveralls
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
 	sudo apt-get install valgrind
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-	brew install valgrind
-else
-	echo "Unknown OS '$TRAVIS_OS_NAME'."
-	exit 1
+	export VALGRIND=1
+	export VALGRIND_LOG="$tmpdir/valgrind-%p.log"
 fi
 
 setup_deps x64
 
-export VALGRIND=1
-export VALGRIND_LOG="$tmpdir/valgrind-%p.log"
 CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \
 	-DUSE_GCOV=ON \
 	-DBUSTED_OUTPUT_TYPE=plainTerminal"

.travis.yml

@@ -16,19 +16,19 @@ env:
     # Force verification of DLOG macros.
     - CFLAGS='-DMIN_LOG_LEVEL=0'
   matrix:
-    - CI_TARGET=clang-asan
+    - CI_TARGET=clang
     - CI_TARGET=gcc
     - CI_TARGET=gcc-32
     - CI_TARGET=clint
 matrix:
   include:
     - os: osx
-      env: CI_TARGET=clang-asan
+      env: CI_TARGET=clang
+      compiler: clang
     - os: osx
       env: CI_TARGET=gcc
       compiler: gcc-4.9
-  allow_failures:
-    - os: osx
+  fast_finish: true
 before_install:
   # Pins the version of the java package installed on the Travis VMs
   # and avoids a lengthy upgrade process for them.
@@ -41,6 +41,8 @@ before_install:
 install:
   - if [ $TRAVIS_OS_NAME = linux ]; then
       sudo apt-get install xclip gdb;
+    elif [ $TRAVIS_OS_NAME = osx ]; then
+      brew install gettext;
     fi
 before_script:
   # Adds user to a dummy group.

CONTRIBUTING.md

@@ -68,6 +68,11 @@ For new code, please run [`clint.py`][clint] to detect style errors. It is not
 perfect and may have false positives and negatives. To have `clint.py` ignore
 certain special cases, put `// NOLINT` at the end of the line.
 
+We also provide a configuration file for [`clang-format` and 
+`git-clang-format`][clang-format], which can be used to format code according
+to the style guidelines. Be aware this formatting method might need user
+supervision.
+
 #### Commit guidelines
 
 The purpose of these guidelines is to *make reviews easier* and make the VCS logs more valuable.
@@ -93,6 +98,7 @@ The purpose of these guidelines is to *make reviews easier* and make the VCS log
 
 [cla]: https://docs.google.com/forms/d/1u54bpbwzneDIRltFx1TGi2evKxY3w0cOV3vlpj8DPbg/viewform
 [clint]: clint.py
+[clang-format]: http://clang.llvm.org/docs/ClangFormat.html
 [entry]: https://github.com/neovim/neovim/issues?labels=entry-level&state=open
 [imperative]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [style]: http://neovim.org/develop/style-guide.xml

cmake/RunTests.cmake

@@ -17,8 +17,10 @@ execute_process(
   COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE}
     --lpath=${BUILD_DIR}/?.lua ${TEST_PATH}
   WORKING_DIRECTORY ${WORKING_DIR}
+  ERROR_VARIABLE err
   RESULT_VARIABLE res)
 
 if(NOT res EQUAL 0)
+  message(STATUS "Output to stderr:\n${err}")
   message(FATAL_ERROR "Running ${TEST_TYPE} tests failed with error: ${res}.")
 endif()

config/CMakeLists.txt

@@ -7,6 +7,8 @@ check_type_size("int" SIZEOF_INT)
 check_type_size("long" SIZEOF_LONG)
 check_type_size("intmax_t" SIZEOF_INTMAX_T)
 check_type_size("off_t" SIZEOF_OFF_T)
+check_type_size("size_t" SIZEOF_SIZE_T)
+check_type_size("long long" SIZEOF_LONG_LONG)
 check_type_size("void *" SIZEOF_VOID_PTR)
 
 check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)

runtime/doc/Makefile

@@ -254,28 +254,22 @@ HTMLS = \
 
 MANPAGES = \
 	manpages/vim.man \
-	manpages/vimdiff.man \
 	manpages/vimtutor.man \
 	manpages/xxd.man \
 	manpages/de/vim-de.man \
 	manpages/fr/vim-fr.man \
-	manpages/fr/vimdiff-fr.man \
 	manpages/fr/vimtutor-fr.man \
 	manpages/fr/xxd-fr.man \
 	manpages/pl/vim-pl.man \
-	manpages/pl/vimdiff-pl.man \
 	manpages/pl/vimtutor-pl.man \
 	manpages/pl/xxd-pl.man \
 	manpages/it/vim-it.man \
-	manpages/it/vimdiff-it.man \
 	manpages/it/vimtutor-it.man \
 	manpages/it/xxd-it.man \
 	manpages/ru/vim-ru.man \
-	manpages/ru/vimdiff-ru.man \
 	manpages/ru/vimtutor-ru.man \
 	manpages/ru/xxd-ru.man \
 	manpages/ja/vim-ja.man \
-	manpages/ja/vimdiff-ja.man \
 	manpages/ja/vimtutor-ja.man \
 	manpages/ja/xxd-ja.man
 

runtime/doc/diff.txt

@@ -1,39 +1,31 @@
-*diff.txt*      For Vim version 7.4.  Last change: 2014 May 20
+*diff.txt*      For Vim version 7.4.  Last change: 2015 Jan 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
-				*diff* *vimdiff* *gvimdiff* *diff-mode*
-This file describes the |+diff| feature: Showing differences between two,
-three or four versions of the same file.
+							*diff* *diff-mode*
+This file describes |diff-mode|, which shows the differences between two,
+three, or four versions of the same file.
 
 The basics are explained in section |08.7| of the user manual.
 
-1. Starting diff mode		|vimdiff|
+1. Starting diff mode		|diff-mode|
 2. Viewing diffs		|view-diffs|
 3. Jumping to diffs		|jumpto-diffs|
 4. Copying diffs		|copy-diffs|
 5. Diff options			|diff-options|
 
-{not in Vi}
-
 ==============================================================================
 1. Starting diff mode
 
-The easiest way to start editing in diff mode is with the "vimdiff" command.
-This starts Vim as usual, and additionally sets up for viewing the differences
-between the arguments. >
-
-	vimdiff file1 file2 [file3 [file4]]
-
-This is equivalent to: >
+To start editing in diff mode, run "nvim -d".  This starts Nvim as usual, and
+additionally sets up for viewing the differences between the arguments. >
 
-	vim -d file1 file2 [file3 [file4]]
+	nvim -d file1 file2 [file3 [file4]]
 
-You may also use "gvimdiff" or "vim -d -g".  The GUI is started then.
-You may also use "viewdiff" or "gviewdiff".  Vim starts in readonly mode then.
-"r" may be prepended for restricted mode (see |-Z|).
+In addition to the |-d| argument, |-Z| and |-R| may be used for restricted
+mode and readonly mode respectively.
 
 The second and following arguments may also be a directory name.  Vim will
 then append the file name of the first argument to the directory name to find
@@ -45,11 +37,11 @@ Diffs are local to the current tab page |tab-page|.  You can't see diffs with
 a window in another tab page.  This does make it possible to have several
 diffs at the same time, each in their own tab page.
 
-What happens is that Vim opens a window for each of the files.  This is like
-using the |-O| argument.  This uses vertical splits.  If you prefer horizontal
-splits add the |-o| argument: >
+What happens is that Nvim opens a window for each of the files.  This is like
+using the |-O| argument.  This uses vertical splits, but if you prefer
+horizontal splits use the |-o| argument instead: >
 
-	vimdiff -o file1 file2 [file3 [file4]]
+	nvim -d -o file1 file2 [file3 [file4]]
 
 If you always prefer horizontal splits include "horizontal" in 'diffopt'.
 
@@ -88,17 +80,17 @@ While already in Vim you can start diff mode in three ways.
 							*E98*
 :diffs[plit] {filename}					*:diffs* *:diffsplit*
 		Open a new window on the file {filename}.  The options are set
-		as for "vimdiff" for the current and the newly opened window.
+		as for "nvim -d" for the current and the newly opened window.
 		Also see 'diffexpr'.
 
 							*:difft* *:diffthis*
 :difft[his]	Make the current window part of the diff windows.  This sets
-		the options like for "vimdiff".
+		the options as for "nvim -d".
 
 :diffp[atch] {patchfile}			 *E816* *:diffp* *:diffpatch*
 		Use the current buffer, patch it with the diff found in
-		{patchfile} and open a buffer on the result.  The options are
-		set as for "vimdiff".
+		{patchfile} and open a buffer on the result.  This sets the
+		options as for "nvim -d".
 		{patchfile} can be in any format that the "patch" program
 		understands or 'patchexpr' can handle.
 		Note that {patchfile} should only contain a diff for one file,
@@ -172,7 +164,7 @@ possible to view the changes you have made to a buffer since the file was
 loaded.  Since Vim doesn't allow having two buffers for the same file, you
 need another buffer.  This command is useful: >
 	 command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_
-	 	\ | diffthis | wincmd p | diffthis
+		\ | diffthis | wincmd p | diffthis
 (this is in |vimrc_example.vim|).  Use ":DiffOrig" to see the differences
 between the current buffer and the file it was loaded from.