[oe-commits] [openembedded-core] branch master-next updated: testexport.bbclass: Update to use python3

git at git.openembedded.org git at git.openembedded.org
Thu Jun 2 21:21:57 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

The following commit(s) were added to refs/heads/master-next by this push:
       new  e93e3ee   testexport.bbclass: Update to use python3
e93e3ee is described below

commit e93e3ee08d4608eebed73c813ba802e92449e87d
Author: Mariano Lopez <mariano.lopez at linux.intel.com>
AuthorDate: Thu Jun 2 13:09:58 2016 +0000

    testexport.bbclass: Update to use python3
    
    Remove deprecated attributes in order to use python3.
    
    runexported was changed to use python3.
    
    [YOCTO #9702]
    
    Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/testexport.bbclass | 4 ++--
 meta/lib/oeqa/runexported.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass
index e06c668..51b7d93 100644
--- a/meta/classes/testexport.bbclass
+++ b/meta/classes/testexport.bbclass
@@ -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
diff --git a/meta/lib/oeqa/runexported.py b/meta/lib/oeqa/runexported.py
index 52c1171..f1366a6 100755
--- a/meta/lib/oeqa/runexported.py
+++ b/meta/lib/oeqa/runexported.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 
 # Copyright (C) 2013 Intel Corporation

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list