diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-10 14:45:15 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 11:02:26 +0000 |
| commit | bdc844b3f0c3fbddcd3523095899a5bd29797704 (patch) | |
| tree | be0f0c20ccd1ac9483d0f680f876c0ef798a0a9b | |
| parent | 66bf6978fc807ecc422fb6b6328f68bc3406cf15 (diff) | |
| download | openembedded-core-bdc844b3f0c3fbddcd3523095899a5bd29797704.tar.gz openembedded-core-bdc844b3f0c3fbddcd3523095899a5bd29797704.tar.bz2 openembedded-core-bdc844b3f0c3fbddcd3523095899a5bd29797704.zip | |
oe-selftest: devtool: test update-recipe with only local files
Add a test to ensure devtool update-recipe works properly on recipes
that contain only local files (since the other tests we have didn't test
that).
Relates to [YOCTO #10563].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
4 files changed, 26 insertions, 0 deletions
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb new file mode 100644 index 0000000000..28ff49ef85 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb @@ -0,0 +1,6 @@ +LICENSE = "CLOSED" +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = "file://file1 \ + file://file2" + diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1 b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1 new file mode 100644 index 0000000000..f4bdcfc831 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1 @@ -0,0 +1 @@ +The first file diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2 b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2 new file mode 100644 index 0000000000..a7e2414bd5 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2 @@ -0,0 +1 @@ +The second file diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 46f5a0b998..f6226c1ad9 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -930,6 +930,24 @@ class DevtoolTests(DevtoolBase): ('??', '.*/0001-Add-new-file.patch$')] self._check_repo_status(os.path.dirname(recipefile), expected_status) + def test_devtool_update_recipe_local_files_3(self): + # First, modify the recipe + testrecipe = 'devtool-test-localonly' + recipefile = get_bb_var('FILE', testrecipe) + src_uri = get_bb_var('SRC_URI', testrecipe) + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + # (don't bother with cleaning the recipe on teardown, we won't be building it) + result = runCmd('devtool modify %s' % testrecipe) + # Modify one file + runCmd('echo "Another line" >> file2', cwd=os.path.join(self.workspacedir, 'sources', testrecipe, 'oe-local-files')) + self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) + result = runCmd('devtool update-recipe %s' % testrecipe) + expected_status = [(' M', '.*/%s/file2$' % testrecipe)] + self._check_repo_status(os.path.dirname(recipefile), expected_status) + @testcase(1163) def test_devtool_extract(self): tempdir = tempfile.mkdtemp(prefix='devtoolqa') |