[OE-core] [PATCH 1/2] meta/classes/testexport: Use manfiest filenames for package and testdata

[Aníbal Limón]

Is clear to know for what image and machine the testexport package
manifest and testdata was build.

Signed-off-by: Aníbal Limón <anibal.limon at linaro.org>
---
 meta/classes/testexport.bbclass  | 4 ++--
 meta/lib/oeqa/runtime/context.py | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass
index d070f07afa..8b01504d3a 100644
--- a/meta/classes/testexport.bbclass
+++ b/meta/classes/testexport.bbclass
@@ -128,8 +128,8 @@ def copy_needed_files(d, tc):
     tdname = "%s.testdata.json" % image_name
     test_data_path = os.path.join(export_path, 'data')
     bb.utils.mkdirhier(test_data_path)
-    shutil.copy2(image_manifest, os.path.join(test_data_path, 'manifest'))
-    shutil.copy2(tdname, os.path.join(test_data_path, 'testdata.json'))
+    shutil.copy2(image_manifest, os.path.join(test_data_path, os.path.basename(image_manifest)))
+    shutil.copy2(tdname, os.path.join(test_data_path, os.path.basename(tdname)))
 
     # Create tar file for common parts of testexport
     create_tarball(d, "testexport.tar.gz", d.getVar("TEST_EXPORT_DIR"))
diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py
index a7f3823996..31dba75784 100644
--- a/meta/lib/oeqa/runtime/context.py
+++ b/meta/lib/oeqa/runtime/context.py
@@ -2,6 +2,7 @@
 # Released under the MIT license (see COPYING.MIT)
 
 import os
+import glob
 
 from oeqa.core.context import OETestContext, OETestContextExecutor
 from oeqa.core.target.ssh import OESSHTarget
@@ -42,11 +43,15 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
     default_cases = os.path.join(os.path.abspath(os.path.dirname(__file__)),
             'cases')
     default_data = None
-    default_test_data = 'data/testdata.json'
+    m = glob.glob('data/*.testdata.json')
+    if m:
+        default_test_data = m[0]
     default_tests = ''
 
     default_target_type = 'simpleremote'
-    default_manifest = 'data/manifest'
+    m = glob.glob('data/*.manifest')
+    if m:
+        default_manifest = m[0]
     default_server_ip = '192.168.7.1'
     default_target_ip = '192.168.7.2'
     default_host_dumper_dir = '/tmp/oe-saved-tests'
-- 
2.11.0