diff options
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/archiver.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/lib/oeqa/selftest/cases/archiver.py b/meta/lib/oeqa/selftest/cases/archiver.py index 37efed57c8..ddd08ecf84 100644 --- a/meta/lib/oeqa/selftest/cases/archiver.py +++ b/meta/lib/oeqa/selftest/cases/archiver.py | |||
@@ -19,8 +19,8 @@ class Archiver(OESelftestTestCase): | |||
19 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> | 19 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> |
20 | """ | 20 | """ |
21 | 21 | ||
22 | include_recipe = 'busybox' | 22 | include_recipe = 'selftest-ed' |
23 | exclude_recipe = 'zlib' | 23 | exclude_recipe = 'initscripts' |
24 | 24 | ||
25 | features = 'INHERIT += "archiver"\n' | 25 | features = 'INHERIT += "archiver"\n' |
26 | features += 'ARCHIVER_MODE[src] = "original"\n' | 26 | features += 'ARCHIVER_MODE[src] = "original"\n' |
@@ -51,8 +51,8 @@ class Archiver(OESelftestTestCase): | |||
51 | Author: André Draszik <adraszik@tycoint.com> | 51 | Author: André Draszik <adraszik@tycoint.com> |
52 | """ | 52 | """ |
53 | 53 | ||
54 | target_recipe = 'initscripts' | 54 | target_recipe = 'selftest-ed' |
55 | native_recipe = 'zlib-native' | 55 | native_recipe = 'selftest-ed-native' |
56 | 56 | ||
57 | features = 'INHERIT += "archiver"\n' | 57 | features = 'INHERIT += "archiver"\n' |
58 | features += 'ARCHIVER_MODE[src] = "original"\n' | 58 | features += 'ARCHIVER_MODE[src] = "original"\n' |
@@ -86,8 +86,8 @@ class Archiver(OESelftestTestCase): | |||
86 | Author: André Draszik <adraszik@tycoint.com> | 86 | Author: André Draszik <adraszik@tycoint.com> |
87 | """ | 87 | """ |
88 | 88 | ||
89 | target_recipes = [ 'initscripts', 'zlib' ] | 89 | target_recipes = [ 'initscripts', 'selftest-ed' ] |
90 | native_recipes = [ 'update-rc.d-native', 'zlib-native' ] | 90 | native_recipes = [ 'update-rc.d-native', 'selftest-ed-native' ] |
91 | 91 | ||
92 | features = 'INHERIT += "archiver"\n' | 92 | features = 'INHERIT += "archiver"\n' |
93 | features += 'ARCHIVER_MODE[src] = "original"\n' | 93 | features += 'ARCHIVER_MODE[src] = "original"\n' |
@@ -129,10 +129,10 @@ class Archiver(OESelftestTestCase): | |||
129 | features += 'PACKAGE_CLASSES = "package_rpm"\n' | 129 | features += 'PACKAGE_CLASSES = "package_rpm"\n' |
130 | self.write_config(features) | 130 | self.write_config(features) |
131 | 131 | ||
132 | bitbake('-n core-image-sato') | 132 | bitbake('-n selftest-nopackages selftest-ed') |
133 | 133 | ||
134 | def _test_archiver_mode(self, mode, target_file_name, extra_config=None): | 134 | def _test_archiver_mode(self, mode, target_file_name, extra_config=None): |
135 | target = "selftest-ed" | 135 | target = 'selftest-ed-native' |
136 | 136 | ||
137 | features = 'INHERIT += "archiver"\n' | 137 | features = 'INHERIT += "archiver"\n' |
138 | features += 'ARCHIVER_MODE[src] = "%s"\n' % (mode) | 138 | features += 'ARCHIVER_MODE[src] = "%s"\n' % (mode) |
@@ -143,8 +143,8 @@ class Archiver(OESelftestTestCase): | |||
143 | bitbake('-c clean %s' % (target)) | 143 | bitbake('-c clean %s' % (target)) |
144 | bitbake('-c deploy_archives %s' % (target)) | 144 | bitbake('-c deploy_archives %s' % (target)) |
145 | 145 | ||
146 | bb_vars = get_bb_vars(['DEPLOY_DIR_SRC', 'TARGET_SYS']) | 146 | bb_vars = get_bb_vars(['DEPLOY_DIR_SRC', 'BUILD_SYS']) |
147 | glob_str = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['TARGET_SYS'], '%s-*' % (target)) | 147 | glob_str = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['BUILD_SYS'], '%s-*' % (target)) |
148 | glob_result = glob.glob(glob_str) | 148 | glob_result = glob.glob(glob_str) |
149 | self.assertTrue(glob_result, 'Missing archiver directory for %s' % (target)) | 149 | self.assertTrue(glob_result, 'Missing archiver directory for %s' % (target)) |
150 | 150 | ||
@@ -163,21 +163,21 @@ class Archiver(OESelftestTestCase): | |||
163 | Test that the archiver works with `ARCHIVER_MODE[src] = "patched"`. | 163 | Test that the archiver works with `ARCHIVER_MODE[src] = "patched"`. |
164 | """ | 164 | """ |
165 | 165 | ||
166 | self._test_archiver_mode('patched', 'selftest-ed-1.14.1-r0-patched.tar.gz') | 166 | self._test_archiver_mode('patched', 'selftest-ed-native-1.14.1-r0-patched.tar.gz') |
167 | 167 | ||
168 | def test_archiver_mode_configured(self): | 168 | def test_archiver_mode_configured(self): |
169 | """ | 169 | """ |
170 | Test that the archiver works with `ARCHIVER_MODE[src] = "configured"`. | 170 | Test that the archiver works with `ARCHIVER_MODE[src] = "configured"`. |
171 | """ | 171 | """ |
172 | 172 | ||
173 | self._test_archiver_mode('configured', 'selftest-ed-1.14.1-r0-configured.tar.gz') | 173 | self._test_archiver_mode('configured', 'selftest-ed-native-1.14.1-r0-configured.tar.gz') |
174 | 174 | ||
175 | def test_archiver_mode_recipe(self): | 175 | def test_archiver_mode_recipe(self): |
176 | """ | 176 | """ |
177 | Test that the archiver works with `ARCHIVER_MODE[recipe] = "1"`. | 177 | Test that the archiver works with `ARCHIVER_MODE[recipe] = "1"`. |
178 | """ | 178 | """ |
179 | 179 | ||
180 | self._test_archiver_mode('patched', 'selftest-ed-1.14.1-r0-recipe.tar.gz', | 180 | self._test_archiver_mode('patched', 'selftest-ed-native-1.14.1-r0-recipe.tar.gz', |
181 | 'ARCHIVER_MODE[recipe] = "1"\n') | 181 | 'ARCHIVER_MODE[recipe] = "1"\n') |
182 | 182 | ||
183 | def test_archiver_mode_diff(self): | 183 | def test_archiver_mode_diff(self): |
@@ -186,7 +186,7 @@ class Archiver(OESelftestTestCase): | |||
186 | Exclusions controlled by `ARCHIVER_MODE[diff-exclude]` are not yet tested. | 186 | Exclusions controlled by `ARCHIVER_MODE[diff-exclude]` are not yet tested. |
187 | """ | 187 | """ |
188 | 188 | ||
189 | self._test_archiver_mode('patched', 'selftest-ed-1.14.1-r0-diff.gz', | 189 | self._test_archiver_mode('patched', 'selftest-ed-native-1.14.1-r0-diff.gz', |
190 | 'ARCHIVER_MODE[diff] = "1"\n') | 190 | 'ARCHIVER_MODE[diff] = "1"\n') |
191 | 191 | ||
192 | def test_archiver_mode_dumpdata(self): | 192 | def test_archiver_mode_dumpdata(self): |
@@ -194,7 +194,7 @@ class Archiver(OESelftestTestCase): | |||
194 | Test that the archiver works with `ARCHIVER_MODE[dumpdata] = "1"`. | 194 | Test that the archiver works with `ARCHIVER_MODE[dumpdata] = "1"`. |
195 | """ | 195 | """ |
196 | 196 | ||
197 | self._test_archiver_mode('patched', 'selftest-ed-1.14.1-r0-showdata.dump', | 197 | self._test_archiver_mode('patched', 'selftest-ed-native-1.14.1-r0-showdata.dump', |
198 | 'ARCHIVER_MODE[dumpdata] = "1"\n') | 198 | 'ARCHIVER_MODE[dumpdata] = "1"\n') |
199 | 199 | ||
200 | def test_archiver_mode_mirror(self): | 200 | def test_archiver_mode_mirror(self): |