forked from Mirror/pmbootstrap
Fix screwed up progress bars in Travis output (#1213)
Right now, they appear on screen when using --details-to-stdout. This does not work well with Travis CI and screws up the log. Disabling the progress bars in abuild works just like Alpine does it in their Travis CI script: Exporting SUDO_APK as "abuild-apk --no-progress" instead of "abuild-apk". test_check_checksums.py: Run "pmbootstrap build_init" before building any packages, so it is a bit less verbose (downloading the APKINDEX files etc.). Later we run the build init code again (because we use --strict while building the packages), but then the APKINDEX files are already present. So overall the log is a bit shorter before the building starts. (It is still logged to the logfile, which gets printed on error anyway.)
This commit is contained in:
parent
c232c98851
commit
3fe75ddb56
4 changed files with 24 additions and 17 deletions
|
@ -212,19 +212,21 @@ def test_run_abuild(args, monkeypatch):
|
|||
|
||||
# Normal run
|
||||
output = "armhf/test-1-r2.apk"
|
||||
env = {"CARCH": "armhf"}
|
||||
cmd = ["CARCH=armhf", "abuild", "-d"]
|
||||
env = {"CARCH": "armhf", "SUDO_APK": "abuild-apk --no-progress"}
|
||||
sudo_apk = "SUDO_APK='abuild-apk --no-progress'"
|
||||
cmd = ["CARCH=armhf", sudo_apk, "abuild", "-d"]
|
||||
assert func(args, apkbuild, "armhf") == (output, cmd, env)
|
||||
|
||||
# Force and strict
|
||||
cmd = ["CARCH=armhf", "abuild", "-r", "-f"]
|
||||
cmd = ["CARCH=armhf", sudo_apk, "abuild", "-r", "-f"]
|
||||
assert func(args, apkbuild, "armhf", True, True) == (output, cmd, env)
|
||||
|
||||
# cross=native
|
||||
env = {"CARCH": "armhf",
|
||||
"SUDO_APK": "abuild-apk --no-progress",
|
||||
"CROSS_COMPILE": "armv6-alpine-linux-muslgnueabihf-",
|
||||
"CC": "armv6-alpine-linux-muslgnueabihf-gcc"}
|
||||
cmd = ["CARCH=armhf", "CROSS_COMPILE=armv6-alpine-linux-muslgnueabihf-",
|
||||
cmd = ["CARCH=armhf", sudo_apk, "CROSS_COMPILE=armv6-alpine-linux-muslgnueabihf-",
|
||||
"CC=armv6-alpine-linux-muslgnueabihf-gcc", "abuild", "-d"]
|
||||
assert func(args, apkbuild, "armhf", cross="native") == (output, cmd, env)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue