From 8b8a491a037ad5a214b412dcaae999466d4aea64 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 28 Nov 2017 15:16:26 +1300 Subject: oe-selftest: devtool: add test for multiple source trees Add two synthetic tests for devtool modify + devtool finish: first with multiple source trees side-by-side, and second to test with one as a subdirectory of the main source tree. These also test devtool finish's recently added dry-run option and that detects and errors on uncommitted changes without being forced. Signed-off-by: Paul Eggleton --- .../devtool/devtool-test-multisrc-subdir_1.0.bb | 13 +++++++++++++ .../devtool/devtool-test-multisrc/example-files.tar.gz | Bin 0 -> 236 bytes .../devtool/devtool-test-multisrc/example.patch | 7 +++++++ .../devtool/devtool-test-multisrc/mypackage-1.0.tar.gz | Bin 0 -> 903 bytes .../recipes-test/devtool/devtool-test-multisrc_1.0.bb | 11 +++++++++++ 5 files changed, 31 insertions(+) create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-multisrc-subdir_1.0.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-multisrc/example-files.tar.gz create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-multisrc/example.patch create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-multisrc/mypackage-1.0.tar.gz create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-multisrc_1.0.bb (limited to 'meta-selftest/recipes-test') diff --git a/meta-selftest/recipes-test/devtool/devtool-test-multisrc-subdir_1.0.bb b/meta-selftest/recipes-test/devtool/devtool-test-multisrc-subdir_1.0.bb new file mode 100644 index 0000000000..0430382429 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-multisrc-subdir_1.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Recipe to test multiple source trees" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://settings-daemon.c;beginline=1;endline=26;md5=8d77ba1c7a55df48d8d06c5f3d86b49d" + +SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;name=xsettings-daemon \ + git://git.yoctoproject.org/libfakekey;name=libfakekey;destsuffix=git/libfakekey \ +" + +SRCREV_xsettings-daemon = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" +SRCREV_libfakekey = "7ad885912efb2131e80914e964d5e635b0d07b40" + +S = "${WORKDIR}/git" + diff --git a/meta-selftest/recipes-test/devtool/devtool-test-multisrc/example-files.tar.gz b/meta-selftest/recipes-test/devtool/devtool-test-multisrc/example-files.tar.gz new file mode 100644 index 0000000000..fdab4b7367 Binary files /dev/null and b/meta-selftest/recipes-test/devtool/devtool-test-multisrc/example-files.tar.gz differ diff --git a/meta-selftest/recipes-test/devtool/devtool-test-multisrc/example.patch b/meta-selftest/recipes-test/devtool/devtool-test-multisrc/example.patch new file mode 100644 index 0000000000..2e48bf1e7c --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-multisrc/example.patch @@ -0,0 +1,7 @@ +diff -udNr example-files/test2 example-files2/test2 +--- example-files/test2 2017-11-22 10:29:11.766891385 +1300 ++++ example-files2/test2 2017-11-22 10:30:08.920094705 +1300 +@@ -1 +1,3 @@ + Another example file ++ ++More content added here diff --git a/meta-selftest/recipes-test/devtool/devtool-test-multisrc/mypackage-1.0.tar.gz b/meta-selftest/recipes-test/devtool/devtool-test-multisrc/mypackage-1.0.tar.gz new file mode 100644 index 0000000000..b513b283e9 Binary files /dev/null and b/meta-selftest/recipes-test/devtool/devtool-test-multisrc/mypackage-1.0.tar.gz differ diff --git a/meta-selftest/recipes-test/devtool/devtool-test-multisrc_1.0.bb b/meta-selftest/recipes-test/devtool/devtool-test-multisrc_1.0.bb new file mode 100644 index 0000000000..2b81f83387 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-multisrc_1.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "Recipe to test multiple source trees" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://mypackage-${PV}.tar.gz \ + file://example-files.tar.gz \ + file://example.patch;patchdir=../example-files \ +" + +S = "${WORKDIR}/mypackage-${PV}" + -- cgit 1.2.3-korg