tests: add a testcase for applying patches
This adds a test where we clone a git and a hg repo and apply a single patch and later a quilt series on each of them. Signed-off-by: Henning Schild <henning.schild@siemens.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
committed by
Jan Kiszka
parent
8a2a21d799
commit
fafc017392
8
tests/test_patch/patches/hello/001.patch
Normal file
8
tests/test_patch/patches/hello/001.patch
Normal file
@@ -0,0 +1,8 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,1 +1,4 @@
|
||||
all: hello
|
||||
+
|
||||
+clean:
|
||||
+ rm -f hello
|
8
tests/test_patch/patches/hello/quilt/001.patch
Normal file
8
tests/test_patch/patches/hello/quilt/001.patch
Normal file
@@ -0,0 +1,8 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,4 +1,1 @@
|
||||
all: hello
|
||||
-
|
||||
-clean:
|
||||
- rm -f hello
|
8
tests/test_patch/patches/hello/quilt/002.patch
Normal file
8
tests/test_patch/patches/hello/quilt/002.patch
Normal file
@@ -0,0 +1,8 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,1 +1,4 @@
|
||||
all: hello
|
||||
+
|
||||
+clean:
|
||||
+ rm -f hello
|
4
tests/test_patch/patches/hello/quilt/series
Normal file
4
tests/test_patch/patches/hello/quilt/series
Normal file
@@ -0,0 +1,4 @@
|
||||
# test comment
|
||||
# this is a revert of the other 001 we applied without quilt
|
||||
001.patch # first patch
|
||||
002.patch
|
24
tests/test_patch/patches/kas/001.patch
Normal file
24
tests/test_patch/patches/kas/001.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
diff --git a/CHANGELOG.md b/CHANGELOG.md
|
||||
index 4b594e6..f1222ab 100644
|
||||
--- a/CHANGELOG.md
|
||||
+++ b/CHANGELOG.md
|
||||
@@ -1,6 +1,3 @@
|
||||
-1.0
|
||||
-- isar: Take qemu-user-static from buster and adjust binfmt setup
|
||||
-
|
||||
0.20.1
|
||||
- kas-docker: Restore KAS_PREMIRRORS support
|
||||
|
||||
diff --git a/kas/__version__.py b/kas/__version__.py
|
||||
index 0ac2731..020cb6f 100644
|
||||
--- a/kas/__version__.py
|
||||
+++ b/kas/__version__.py
|
||||
@@ -25,7 +25,7 @@
|
||||
__license__ = 'MIT'
|
||||
__copyright__ = 'Copyright (c) Siemens AG, 2017-2018'
|
||||
|
||||
-__version__ = '1.0'
|
||||
+__version__ = '0.20.1'
|
||||
|
||||
# Please update docs/format-changelog.rst when changing the file version.
|
||||
__file_version__ = 8
|
24
tests/test_patch/patches/kas/quilt/001.patch
Normal file
24
tests/test_patch/patches/kas/quilt/001.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
diff --git a/CHANGELOG.md b/CHANGELOG.md
|
||||
index f1222ab..4b594e6 100644
|
||||
--- a/CHANGELOG.md
|
||||
+++ b/CHANGELOG.md
|
||||
@@ -1,3 +1,6 @@
|
||||
+1.0
|
||||
+- isar: Take qemu-user-static from buster and adjust binfmt setup
|
||||
+
|
||||
0.20.1
|
||||
- kas-docker: Restore KAS_PREMIRRORS support
|
||||
|
||||
diff --git a/kas/__version__.py b/kas/__version__.py
|
||||
index 020cb6f..0ac2731 100644
|
||||
--- a/kas/__version__.py
|
||||
+++ b/kas/__version__.py
|
||||
@@ -25,7 +25,7 @@
|
||||
__license__ = 'MIT'
|
||||
__copyright__ = 'Copyright (c) Siemens AG, 2017-2018'
|
||||
|
||||
-__version__ = '0.20.1'
|
||||
+__version__ = '1.0'
|
||||
|
||||
# Please update docs/format-changelog.rst when changing the file version.
|
||||
__file_version__ = 8
|
24
tests/test_patch/patches/kas/quilt/002.patch
Normal file
24
tests/test_patch/patches/kas/quilt/002.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
diff --git a/CHANGELOG.md b/CHANGELOG.md
|
||||
index 4b594e6..f1222ab 100644
|
||||
--- a/CHANGELOG.md
|
||||
+++ b/CHANGELOG.md
|
||||
@@ -1,6 +1,3 @@
|
||||
-1.0
|
||||
-- isar: Take qemu-user-static from buster and adjust binfmt setup
|
||||
-
|
||||
0.20.1
|
||||
- kas-docker: Restore KAS_PREMIRRORS support
|
||||
|
||||
diff --git a/kas/__version__.py b/kas/__version__.py
|
||||
index 0ac2731..020cb6f 100644
|
||||
--- a/kas/__version__.py
|
||||
+++ b/kas/__version__.py
|
||||
@@ -25,7 +25,7 @@
|
||||
__license__ = 'MIT'
|
||||
__copyright__ = 'Copyright (c) Siemens AG, 2017-2018'
|
||||
|
||||
-__version__ = '1.0'
|
||||
+__version__ = '0.20.1'
|
||||
|
||||
# Please update docs/format-changelog.rst when changing the file version.
|
||||
__file_version__ = 8
|
4
tests/test_patch/patches/kas/quilt/series
Normal file
4
tests/test_patch/patches/kas/quilt/series
Normal file
@@ -0,0 +1,4 @@
|
||||
# test comment
|
||||
# this is a revert of the other 001 we applied without quilt
|
||||
001.patch # first patch
|
||||
002.patch
|
Reference in New Issue
Block a user