diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-12-13 20:09:45 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-14 12:30:50 +0000 |
| commit | 0cba3cbcb4178edd554fa2433f525ff2e67a4797 (patch) | |
| tree | 0981bd7d3ec3ac105520e74b7262fa294d455d7c | |
| parent | 229091babb144cda2dd3113a2b072d8e4414a083 (diff) | |
| download | openembedded-core-contrib-0cba3cbcb4178edd554fa2433f525ff2e67a4797.tar.gz | |
oe-selftest: devtool: improve test_devtool_modify slightly
* Check that man .in file actually gets modified, since sed -i doesn't
fail if it it doesn't
* Use a variable for man file path
(From OE-Core rev: 9ad36e945fa5b03726f78ba99e823eade8daa710)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 3abba0805e..19c5ccf60b 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -439,7 +439,15 @@ class DevtoolTests(DevtoolBase): # Try building bitbake('mdadm') # Try making (minor) modifications to the source - result = runCmd("sed -i 's!^\.TH.*!.TH MDADM 8 \"\" v9.999-custom!' %s" % os.path.join(tempdir, 'mdadm.8.in')) + modfile = os.path.join(tempdir, 'mdadm.8.in') + result = runCmd("sed -i 's!^\.TH.*!.TH MDADM 8 \"\" v9.999-custom!' %s" % modfile) + sedline = '' + with open(modfile, 'r') as f: + for line in f: + if line.startswith('.TH'): + sedline = line.rstrip() + break + self.assertEqual(sedline, '.TH MDADM 8 "" v9.999-custom', 'man .in file not modified (sed failed)') bitbake('mdadm -c package') pkgd = get_bb_var('PKGD', 'mdadm') self.assertTrue(pkgd, 'Could not query PKGD variable') @@ -447,10 +455,11 @@ class DevtoolTests(DevtoolBase): self.assertTrue(mandir, 'Could not query mandir variable') if mandir[0] == '/': mandir = mandir[1:] - with open(os.path.join(pkgd, mandir, 'man8', 'mdadm.8'), 'r') as f: + manfile = os.path.join(pkgd, mandir, 'man8', 'mdadm.8') + with open(manfile, 'r') as f: for line in f: if line.startswith('.TH'): - self.assertEqual(line.rstrip(), '.TH MDADM 8 "" v9.999-custom', 'man file not modified. man searched file path: %s' % os.path.join(pkgd, mandir, 'man8', 'mdadm.8')) + self.assertEqual(line.rstrip(), '.TH MDADM 8 "" v9.999-custom', 'man file not modified. man searched file path: %s' % manfile) # Test devtool reset stampprefix = get_bb_var('STAMP', 'mdadm') result = runCmd('devtool reset mdadm') |