]> code.ossystems Code Review - openembedded-core.git/commitdiff
testexport.bbclass: Update to use python3
authorMariano Lopez <mariano.lopez@linux.intel.com>
Thu, 2 Jun 2016 13:09:58 +0000 (13:09 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 3 Jun 2016 12:12:14 +0000 (13:12 +0100)
Remove deprecated attributes in order to use python3.

runexported was changed to use python3.

[YOCTO #9702]

Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/testexport.bbclass
meta/lib/oeqa/runexported.py

index e06c668280e0ce1a64aefed282fdbb440abdbfd1..51b7d93d2b2de3ba26e7c8bf4f8d4be0c1e8ff81 100644 (file)
@@ -95,9 +95,9 @@ def exportTests(d,tc):
                     if not os.path.exists(target_folder):
                         shutil.copytree(foldername, target_folder)
         if not isfolder:
-            shutil.copy2(mod.filename, os.path.join(exportpath, "oeqa/runtime"))
+            shutil.copy2(mod.path, os.path.join(exportpath, "oeqa/runtime"))
     # copy __init__.py files
-    oeqadir = pkgutil.get_loader("oeqa").filename
+    oeqadir = os.path.dirname(pkgutil.get_loader("oeqa").path)
     shutil.copy2(os.path.join(oeqadir, "__init__.py"), os.path.join(exportpath, "oeqa"))
     shutil.copy2(os.path.join(oeqadir, "runtime/__init__.py"), os.path.join(exportpath, "oeqa/runtime"))
     # copy oeqa/oetest.py and oeqa/runexported.py
index 52c1171a3a11055288996a2649193b77a81bc2a2..f1366a63d35bccfb18491f5a9d323c212e94e7bb 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 
 # Copyright (C) 2013 Intel Corporation