[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4013/8267] selftest/buildoptions.py: fix path assumption for DEPLOY_DIR_SRC

[Emmanuele Bassi <ebassi src gnome org>]

commit 988f2efd655f90bd20d6923ea1a8ed50f535656e
Author: Chen Qi <Qi Chen windriver com>
Date:   Tue Jan 10 10:24:54 2017 +0800

    selftest/buildoptions.py: fix path assumption for DEPLOY_DIR_SRC
    
    Fix path assumption for DEPLOY_DIR_SRC, otherwise, the testcase may fail
    even if the functionality works well.
    
    (From OE-Core rev: dab5d3901755a965cdd8f5b5e8ffb8e4cb79f2e5)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/buildoptions.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py
index 25d14f7..95fd2f0 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -197,7 +197,8 @@ class ArchiverTest(oeSelfTest):
         self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = 
\"1\"")
         res = bitbake("xcursor-transparent-theme", ignore_status=True)
         self.assertEqual(res.status, 0, "\nCouldn't build xcursortransparenttheme.\nbitbake output %s" % 
res.output)
-        pkgs_path = g.glob(str(self.builddir) + "/tmp/deploy/sources/allarch*/xcurs*")
+        deploy_dir_src = get_bb_var('DEPLOY_DIR_SRC')
+        pkgs_path = g.glob(str(deploy_dir_src) + "/allarch*/xcurs*")
         src_file_glob = str(pkgs_path[0]) + "/xcursor*.src.rpm"
         tar_file_glob = str(pkgs_path[0]) + "/xcursor*.tar.gz"
-        self.assertTrue((g.glob(src_file_glob) and g.glob(tar_file_glob)), "Couldn't find .src.rpm and 
.tar.gz files under tmp/deploy/sources/allarch*/xcursor*")
+        self.assertTrue((g.glob(src_file_glob) and g.glob(tar_file_glob)), "Couldn't find .src.rpm and 
.tar.gz files under %s/allarch*/xcursor*" % deploy_dir_src)