synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix test/test_build_package.py 

Tested with Travis on an extra branch before pushing to master this
time.
This commit is contained in:
Oliver Smith 2018-04-19 02:14:52 +02:00
parent 86651d6f8e
commit b1b5acd79d
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmb/build/_package.py
View File

@ -351,7 +351,7 @@ def run_abuild(args, apkbuild, arch, strict=False, force=False, cross=None,
env["DISTCC_HOSTS"] = "127.0.0.1:" + args.port_distccd
# Build the abuild command
cmd = ["abuild", "-D" "postmarketOS"]
cmd = ["abuild", "-D", "postmarketOS"]
if strict:
cmd += ["-r"] # install depends with abuild
else:

6
test/test_build_package.py
View File

@ -230,11 +230,11 @@ def test_run_abuild(args, monkeypatch):
# Normal run
output = "armhf/test-1-r2.apk"
env = {"CARCH": "armhf", "SUDO_APK": "abuild-apk --no-progress"}
cmd = ["abuild", "-d"]
cmd = ["abuild", "-D", "postmarketOS", "-d"]
assert func(args, apkbuild, "armhf") == (output, cmd, env)
# Force and strict
cmd = ["abuild", "-r", "-f"]
cmd = ["abuild", "-D", "postmarketOS", "-r", "-f"]
assert func(args, apkbuild, "armhf", True, True) == (output, cmd, env)
# cross=native
@ -242,7 +242,7 @@ def test_run_abuild(args, monkeypatch):
"SUDO_APK": "abuild-apk --no-progress",
"CROSS_COMPILE": "armv6-alpine-linux-muslgnueabihf-",
"CC": "armv6-alpine-linux-muslgnueabihf-gcc"}
cmd = ["abuild", "-d"]
cmd = ["abuild", "-D", "postmarketOS", "-d"]
assert func(args, apkbuild, "armhf", cross="native") == (output, cmd, env)
# cross=distcc