diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-06-02 13:09:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:30 +0100 |
commit | 91a7f54e088693b77cf91b886904cd56b80d7ff7 (patch) | |
tree | b6196a07e23a9da82d088d15e268196ddc273318 | |
parent | 1a2a69e042fbd21a1e8898a61de0315698dc77a7 (diff) | |
download | poky-91a7f54e088693b77cf91b886904cd56b80d7ff7.tar.gz |
testexport.bbclass: Update to use python3
Remove deprecated attributes in order to use python3.
runexported was changed to use python3.
[YOCTO #9702]
(From OE-Core rev: 9129af6dc421455c0253be313bf5781b913dc5fd)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/testexport.bbclass | 4 | ||||
-rwxr-xr-x | 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 e06c668280..51b7d93d2b 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass | |||
@@ -95,9 +95,9 @@ def exportTests(d,tc): | |||
95 | if not os.path.exists(target_folder): | 95 | if not os.path.exists(target_folder): |
96 | shutil.copytree(foldername, target_folder) | 96 | shutil.copytree(foldername, target_folder) |
97 | if not isfolder: | 97 | if not isfolder: |
98 | shutil.copy2(mod.filename, os.path.join(exportpath, "oeqa/runtime")) | 98 | shutil.copy2(mod.path, os.path.join(exportpath, "oeqa/runtime")) |
99 | # copy __init__.py files | 99 | # copy __init__.py files |
100 | oeqadir = pkgutil.get_loader("oeqa").filename | 100 | oeqadir = os.path.dirname(pkgutil.get_loader("oeqa").path) |
101 | shutil.copy2(os.path.join(oeqadir, "__init__.py"), os.path.join(exportpath, "oeqa")) | 101 | shutil.copy2(os.path.join(oeqadir, "__init__.py"), os.path.join(exportpath, "oeqa")) |
102 | shutil.copy2(os.path.join(oeqadir, "runtime/__init__.py"), os.path.join(exportpath, "oeqa/runtime")) | 102 | shutil.copy2(os.path.join(oeqadir, "runtime/__init__.py"), os.path.join(exportpath, "oeqa/runtime")) |
103 | # copy oeqa/oetest.py and oeqa/runexported.py | 103 | # copy oeqa/oetest.py and oeqa/runexported.py |
diff --git a/meta/lib/oeqa/runexported.py b/meta/lib/oeqa/runexported.py index 52c1171a3a..f1366a63d3 100755 --- a/meta/lib/oeqa/runexported.py +++ b/meta/lib/oeqa/runexported.py | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python3 |
2 | 2 | ||
3 | 3 | ||
4 | # Copyright (C) 2013 Intel Corporation | 4 | # Copyright (C) 2013 Intel Corporation |