diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-01-06 12:36:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-09 13:39:13 +0000 |
| commit | 949c7062b7b4d785e949d483fa46ada824442d53 (patch) | |
| tree | 8d2792247fc6c07a53846084f25bbb7b1fa5898f /meta/lib | |
| parent | 1a06778c093987592e513d2efdf4a00a2b33a158 (diff) | |
| download | poky-949c7062b7b4d785e949d483fa46ada824442d53.tar.gz | |
selftest/devtool: update test to work with new mtd-utils
The new mtd-utils (version 2.0) has been autotooled so the test needs to touch
Makefile.am instead of Makefile.
(From OE-Core rev: acce512a0b85853b5acf2ef07e4163a3b4f33a98)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index a3beefa2c2..2512c6941e 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py | |||
| @@ -688,7 +688,7 @@ class DevtoolTests(DevtoolBase): | |||
| 688 | self._check_src_repo(tempdir) | 688 | self._check_src_repo(tempdir) |
| 689 | # Add a couple of commits | 689 | # Add a couple of commits |
| 690 | # FIXME: this only tests adding, need to also test update and remove | 690 | # FIXME: this only tests adding, need to also test update and remove |
| 691 | result = runCmd('echo "# Additional line" >> Makefile', cwd=tempdir) | 691 | result = runCmd('echo "# Additional line" >> Makefile.am', cwd=tempdir) |
| 692 | result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempdir) | 692 | result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempdir) |
| 693 | result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir) | 693 | result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir) |
| 694 | result = runCmd('git add devtool-new-file', cwd=tempdir) | 694 | result = runCmd('git add devtool-new-file', cwd=tempdir) |
| @@ -825,7 +825,7 @@ class DevtoolTests(DevtoolBase): | |||
| 825 | # Check git repo | 825 | # Check git repo |
| 826 | self._check_src_repo(tempsrcdir) | 826 | self._check_src_repo(tempsrcdir) |
| 827 | # Add a commit | 827 | # Add a commit |
| 828 | result = runCmd('echo "# Additional line" >> Makefile', cwd=tempsrcdir) | 828 | result = runCmd('echo "# Additional line" >> Makefile.am', cwd=tempsrcdir) |
| 829 | result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempsrcdir) | 829 | result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempsrcdir) |
| 830 | self.add_command_to_tearDown('cd %s; rm -f %s/*.patch; git checkout .' % (os.path.dirname(recipefile), testrecipe)) | 830 | self.add_command_to_tearDown('cd %s; rm -f %s/*.patch; git checkout .' % (os.path.dirname(recipefile), testrecipe)) |
| 831 | # Create a temporary layer | 831 | # Create a temporary layer |