[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3964/8267] selftest/devtool: update test to work with new mtd-utils



commit 949c7062b7b4d785e949d483fa46ada824442d53
Author: Ross Burton <ross burton intel com>
Date:   Fri Jan 6 12:36:45 2017 +0000

    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>

 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 a3beefa..2512c69 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -688,7 +688,7 @@ class DevtoolTests(DevtoolBase):
         self._check_src_repo(tempdir)
         # Add a couple of commits
         # FIXME: this only tests adding, need to also test update and remove
-        result = runCmd('echo "# Additional line" >> Makefile', cwd=tempdir)
+        result = runCmd('echo "# Additional line" >> Makefile.am', cwd=tempdir)
         result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempdir)
         result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir)
         result = runCmd('git add devtool-new-file', cwd=tempdir)
@@ -825,7 +825,7 @@ class DevtoolTests(DevtoolBase):
         # Check git repo
         self._check_src_repo(tempsrcdir)
         # Add a commit
-        result = runCmd('echo "# Additional line" >> Makefile', cwd=tempsrcdir)
+        result = runCmd('echo "# Additional line" >> Makefile.am', cwd=tempsrcdir)
         result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempsrcdir)
         self.add_command_to_tearDown('cd %s; rm -f %s/*.patch; git checkout .' % 
(os.path.dirname(recipefile), testrecipe))
         # Create a temporary layer


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]