# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1595512803 -7200
# Node ID 26bdc67a39188785c64131a39bca5a45927226cf
# Parent  a2bf60c69fb9157e4efd3af5cc84e34901eec9cd
patch 8.2.1279: some tests on Travis have EXITFREE duplicated

Commit: https://github.com/vim/vim/commit/8d5f6af5e5a5edfd3fa95f33540c204f4e74331e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Jul 23 15:50:40 2020 +0200

    patch 8.2.1279: some tests on Travis have EXITFREE duplicated

    Problem:    Some tests on Travis have EXITFREE duplicated.
    Solution:   Remove EXITFREE from shadowopt.  Add "shadow" to job name.

diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ language: c
       SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
       ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
     - &shadowopt
-      LEAK_CFLAGS="-DEXITFREE" SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
+      SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
 
   linux: &linux
     os: linux
@@ -191,13 +191,13 @@ jobs:
       compiler: gcc
       env: *small
     - <<: *linux
-      name: normal/clang
+      name: normal+shadow/clang
       compiler: clang
       env:
         - *normal
         - *shadowopt
     - <<: *linux
-      name: normal/gcc
+      name: normal+shadow/gcc
       compiler: gcc
       env:
         - *normal
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1279,
+/**/
     1278,
 /**/
     1277,