Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pmbootstrap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
postmarketOS
pmbootstrap
Commits
2a80bbdb
Unverified
Commit
2a80bbdb
authored
3 years ago
by
Clayton Craft
Browse files
Options
Downloads
Patches
Plain Diff
test/aportgen_device_wizard: use armv7 in test instead of armhf (MR 2054)
armhf isn't valid for new devices anymore
parent
aa2c7408
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
test/test_aportgen_device_wizard.py
+4
-4
4 additions, 4 deletions
test/test_aportgen_device_wizard.py
with
4 additions
and
4 deletions
test/test_aportgen_device_wizard.py
+
4
−
4
View file @
2a80bbdb
...
...
@@ -113,7 +113,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
"""
# Answers to interactive questions
answers
=
{
"
Device architecture
"
:
"
arm
hf
"
,
"
Device architecture
"
:
"
arm
v7
"
,
"
external storage
"
:
"
y
"
,
"
hardware keyboard
"
:
"
n
"
,
"
Flash method
"
:
"
heimdall
"
,
...
...
@@ -134,12 +134,12 @@ def test_aportgen_device_wizard(args, monkeypatch):
assert
apkbuild_linux
[
"
pkgname
"
]
==
"
linux-testsuite-testdevice
"
assert
apkbuild_linux
[
"
pkgdesc
"
]
==
"
Testsuite Testdevice kernel fork
"
assert
apkbuild_linux
[
"
arch
"
]
==
[
"
arm
hf
"
]
assert
apkbuild_linux
[
"
arch
"
]
==
[
"
arm
v7
"
]
assert
apkbuild_linux
[
"
_flavor
"
]
==
"
testsuite-testdevice
"
assert
deviceinfo
[
"
name
"
]
==
"
Testsuite Testdevice
"
assert
deviceinfo
[
"
manufacturer
"
]
==
answers
[
"
Manufacturer
"
]
assert
deviceinfo
[
"
arch
"
]
==
"
arm
hf
"
assert
deviceinfo
[
"
arch
"
]
==
"
arm
v7
"
assert
deviceinfo
[
"
year
"
]
==
"
1337
"
assert
deviceinfo
[
"
chassis
"
]
==
"
handset
"
assert
deviceinfo
[
"
keyboard
"
]
==
"
false
"
...
...
@@ -151,7 +151,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
# Build the device package
pkgname
=
"
device-testsuite-testdevice
"
pmb
.
build
.
checksum
.
update
(
args
,
pkgname
)
pmb
.
build
.
package
(
args
,
pkgname
,
"
arm
hf
"
,
force
=
True
)
pmb
.
build
.
package
(
args
,
pkgname
,
"
arm
v7
"
,
force
=
True
)
# Abort on overwrite confirmation
answers
[
"
overwrite
"
]
=
"
n
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment