diff options
| -rw-r--r-- | scripts/Util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 3631cf6ea15..34bc5b5e0ca 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2032,8 +2032,8 @@ class UWPProcessController(RemoteProcessController): config = current.config.buildConfig layout = os.path.join(toplevel, "cpp", "test", platform, config, "AppX") - self.packageFullName = "{0}_1.0.0.0_{1}__3qjctahehqazm".format( - self.name, "x86" if platform == "Win32" else platform) + arch = "x86" if platform == "Win32" else platform + self.packageFullName = "{0}_1.0.0.0_{1}__3qjctahehqazm".format(self.name, arch) prefix = "controller_1.0.0.0_{0}{1}".format(platform, "_{0}".format(config) if config == "Debug" else "") package = os.path.join(toplevel, "cpp", "msbuild", "AppPackages", "controller", @@ -2058,7 +2058,7 @@ class UWPProcessController(RemoteProcessController): run("MakeAppx.exe unpack /p \"{0}\" /d \"{1}\" /l".format(package, layout)) print("Registering application to run from layout...") - dependenciesDir = os.path.join(os.path.dirname(package), "Dependencies") + dependenciesDir = os.path.join(os.path.dirname(package), "Dependencies", arch) for f in filter(lambda f: f.endswith(".appx"), os.listdir(dependenciesDir)): run("powershell Add-AppxPackage -Path \"{0}\"".format(os.path.join(dependenciesDir, f))) run("powershell Add-AppxPackage -Register \"{0}/AppxManifest.xml\"".format(layout)) |