diff --git a/tests/netrw-plugin-delete-command-broken/Makefile b/tests/netrw-plugin-delete-command-broken/Makefile
deleted file mode 100644
index 5e02ce3..0000000
--- a/tests/netrw-plugin-delete-command-broken/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Makefile of netrw-plugin-delete-command-broken
-# Description: Test for netrw plugin: delete command broken
-# Author: Petr Splichal <psplicha@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-# This copyrighted material is made available to anyone wishing
-# to use, modify, copy, or redistribute it subject to the terms
-# and conditions of the GNU General Public License version 2.
-#
-# This program is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/vim/Regression/netrw-plugin-delete-command-broken
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
- ./runtest.sh
-
-build: $(BUILT_FILES)
- chmod a+x runtest.sh
-
-clean:
- rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
- @echo "Owner: Petr Splichal <psplicha@redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "Description: Test for netrw plugin: delete command broken" >> $(METADATA)
- @echo "Type: Regression" >> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: vim" >> $(METADATA)
- @echo "Priority: Normal" >> $(METADATA)
- @echo "License: GPLv2" >> $(METADATA)
- @echo "Confidential: no" >> $(METADATA)
- @echo "Destructive: no" >> $(METADATA)
- @echo "Requires: vim-enhanced" >> $(METADATA)
-
- rhts-lint $(METADATA)
diff --git a/tests/netrw-plugin-delete-command-broken/PURPOSE b/tests/netrw-plugin-delete-command-broken/PURPOSE
deleted file mode 100644
index 45af60a..0000000
--- a/tests/netrw-plugin-delete-command-broken/PURPOSE
+++ /dev/null
@@ -1,9 +0,0 @@
-PURPOSE of netrw-plugin-delete-command-broken
-Description: Test for netrw plugin: delete command broken
-Author: Petr Splichal <psplicha@redhat.com>
-Summary: netrw plugin: delete command broken
-
-Description:
-
-Regression to to verify the delete command of netrw plugin
-successfully deletes files or directories.
diff --git a/tests/netrw-plugin-delete-command-broken/runtest.sh b/tests/netrw-plugin-delete-command-broken/runtest.sh
deleted file mode 100755
index 6dbf8c4..0000000
--- a/tests/netrw-plugin-delete-command-broken/runtest.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# runtest.sh of /CoreOS/vim/Regression/netrw-plugin-delete-command-broken
-# Description: Test for netrw plugin: delete command broken
-# Author: Petr Splichal <psplicha@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-# This copyrighted material is made available to anyone wishing
-# to use, modify, copy, or redistribute it subject to the terms
-# and conditions of the GNU General Public License version 2.
-#
-# This program is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/share/rhts-library/rhtslib.sh
-
-PACKAGE="vim-enhanced"
-
-rlJournalStart
- rlPhaseStartSetup
- rlAssertRpm $PACKAGE
- rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
- rlRun "pushd $TmpDir"
- # create test file & dir
- rlRun "touch testfile" 0 "Creating test file"
- rlRun "mkdir testdir" 0 "Creating test directory"
- rlAssertExists "testfile"
- rlAssertExists "testdir"
- # create vim scripts
- rlRun "echo '/testfile
Dy
:q' > scriptfile" \
- 0 "Creating file delete script"
- rlRun "echo '/testdir
Dy
:q' > scriptdir" \
- 0 "Creating directory delete script"
- rlPhaseEnd
-
- rlPhaseStartTest
- rlRun "vim . -s scriptfile" 0 "Deleting file using netrw"
- rlAssertNotExists "testfile"
- rlRun "vim . -s scriptdir" 0 "Deleting directory using netrw"
- rlAssertNotExists "testdir"
- rlPhaseEnd
-
- rlPhaseStartCleanup
- rlRun "popd"
- rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
- rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 7f01b5a..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
- roles:
- - role: standard-test-beakerlib
- tags:
- - classic
- - container
- tests:
- - netrw-plugin-delete-command-broken
- - vim-in-ex-mode-incorrectly-gives-an-eol-error
- required_packages:
- - vim-minimal
- - vim-enhanced
-
-# Tests for Atomic Host
-- hosts: localhost
- roles:
- - role: standard-test-beakerlib
- tags:
- - atomic
- tests:
- - vim-in-ex-mode-incorrectly-gives-an-eol-error
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile
deleted file mode 100644
index 45099dd..0000000
--- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Makefile of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
-# Description: Test for vim in ex mode incorrectly gives an eol error
-# Author: David Kutalek <dkutalek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-# This copyrighted material is made available to anyone wishing
-# to use, modify, copy, or redistribute it subject to the terms
-# and conditions of the GNU General Public License version 2.
-#
-# This program is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE exdoublequote expounddoublequote
-
-.PHONY: all install download clean
-
-run: $(FILES) build
- ./runtest.sh
-
-build: $(BUILT_FILES)
- chmod a+x runtest.sh
-
-clean:
- rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
- @echo "Owner: David Kutalek <dkutalek@redhat.com>" > $(METADATA)
- @echo "Name: $(TEST)" >> $(METADATA)
- @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
- @echo "Path: $(TEST_DIR)" >> $(METADATA)
- @echo "Description: Test for vim in ex mode incorrectly gives an eol error" >> $(METADATA)
- @echo "Type: Regression" >> $(METADATA)
- @echo "TestTime: 5m" >> $(METADATA)
- @echo "RunFor: vim" >> $(METADATA)
- @echo "Requires: vim-minimal" >> $(METADATA)
- @echo "Priority: Normal" >> $(METADATA)
- @echo "License: GPLv2" >> $(METADATA)
- @echo "Confidential: no" >> $(METADATA)
- @echo "Destructive: no" >> $(METADATA)
-
- rhts-lint $(METADATA)
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE
deleted file mode 100644
index 0d6d11a..0000000
--- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE
+++ /dev/null
@@ -1,3 +0,0 @@
-PURPOSE of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
-Description: Test for vim in ex mode incorrectly gives an eol error
-Author: David Kutalek <dkutalek@redhat.com>
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote
deleted file mode 100644
index 4037c88..0000000
--- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote
+++ /dev/null
@@ -1,2 +0,0 @@
-" comment
-q
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote
deleted file mode 100644
index ff82115..0000000
--- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote
+++ /dev/null
@@ -1,2 +0,0 @@
-#" comment
-q
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh
deleted file mode 100755
index 20967bc..0000000
--- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# runtest.sh of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
-# Description: Test for vim in ex mode incorrectly gives an eol error
-# Author: David Kutalek <dkutalek@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-# This copyrighted material is made available to anyone wishing
-# to use, modify, copy, or redistribute it subject to the terms
-# and conditions of the GNU General Public License version 2.
-#
-# This program is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/bin/rhts-environment.sh
-. /usr/lib/beakerlib/beakerlib.sh
-
-PACKAGE="vim"
-
-rlJournalStart
- rlPhaseStartSetup
- rlAssertRpm vim-minimal
- rlPhaseEnd
-
- rlPhaseStartTest
- rlRun "ex -u NONE ~/.bash_profile < ./exdoublequote"
- rlRun "ex -u NONE ~/.bash_profile < ./expounddoublequote"
- rlPhaseEnd
-
-rlJournalPrintText
-rlJournalEnd
diff --git a/vim.spec b/vim.spec
index 9ad7918..e17180d 100644
--- a/vim.spec
+++ b/vim.spec
@@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/
Name: vim
Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: Vim and MIT
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
Source1: vim.sh
@@ -784,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_datadir}/icons/locolor/*/apps/*
%changelog
+* Tue Jun 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.869-2
+- remove tests from dist-git, we use base os ci
+
* Mon Jun 01 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.869-1
- patchlevel 869