scripts/run-config: Export SCRIPTSDIR to avoid scripts having to mess with paths

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-11-08 20:45:56 +00:00
parent efc7526a24
commit 478eb6d78c
2 changed files with 3 additions and 2 deletions

View File

@ -165,7 +165,7 @@
"extravars" : [ "extravars" : [
"RPM_GPG_SIGN_CHUNK = '1'" "RPM_GPG_SIGN_CHUNK = '1'"
], ],
"EXTRACMDS" : ["../yocto-autobuilder-helper/scripts/checkvnc; DISPLAY=:1 oe-selftest --skip-tests distrodata.Distrodata.test_checkpkg -j 15"], "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1 oe-selftest --skip-tests distrodata.Distrodata.test_checkpkg -j 15"],
"ADDLAYER" : ["${BUILDDIR}/../meta-selftest"] "ADDLAYER" : ["${BUILDDIR}/../meta-selftest"]
} }
}, },
@ -538,7 +538,7 @@
"EXTRACMDS" : ["bitbake-selftest"] "EXTRACMDS" : ["bitbake-selftest"]
}, },
"step2" : { "step2" : {
"EXTRACMDS" : ["../yocto-autobuilder-helper/scripts/checkvnc; DISPLAY=:1 oe-selftest --skip-tests distrodata.Distrodata.test_checkpkg -j 15"], "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1 oe-selftest --skip-tests distrodata.Distrodata.test_checkpkg -j 15"],
"ADDLAYER" : ["${BUILDDIR}/../meta-selftest"] "ADDLAYER" : ["${BUILDDIR}/../meta-selftest"]
} }
}, },

View File

@ -45,6 +45,7 @@ parser.add_argument('-q', '--quietlogging',
args = parser.parse_args() args = parser.parse_args()
scriptsdir = os.path.dirname(os.path.realpath(__file__)) scriptsdir = os.path.dirname(os.path.realpath(__file__))
os.environ["SCRIPTSDIR"] = scriptsdir
ourconfig = utils.loadconfig() ourconfig = utils.loadconfig()
testmode = args.test testmode = args.test