File tree Expand file tree Collapse file tree 4 files changed +30
-0
lines changed
Expand file tree Collapse file tree 4 files changed +30
-0
lines changed Original file line number Diff line number Diff line change @@ -28,6 +28,8 @@ PATH="$PATH:/usr/sbin:/sbin"
2828# Add bash and dependencies
2929mkdir -p ${DIR} /usr/bin
3030mkdir -p ${DIR} /usr/lib
31+ mkdir -p ${DIR} /usr/share/runtime/locale/en
32+ echo " test" > ${DIR} /usr/share/runtime/locale/en/test
3133ln -s ../lib ${DIR} /usr/lib64
3234ln -s ../lib ${DIR} /usr/lib32
3335if test -f /sbin/ldconfig.real; then
Original file line number Diff line number Diff line change @@ -125,6 +125,7 @@ if get_option('installed_tests')
125125 ' org.test.Hello-256.png' ,
126126 ' org.flatpak.install_test.json' ,
127127 ' test-locale-cleanup.json' ,
128+ ' test-runtime-platform.json' ,
128129
129130 install_dir : installed_testdir,
130131 install_mode : ' rw-r--r--' ,
Original file line number Diff line number Diff line change @@ -41,6 +41,7 @@ cp $(dirname $0)/test-rename-appdata.json .
4141cp $( dirname $0 ) /test.json .
4242cp $( dirname $0 ) /test.yaml .
4343cp $( dirname $0 ) /test-runtime.json .
44+ cp $( dirname $0 ) /test-runtime-platform.json .
4445cp $( dirname $0 ) /0001-Add-test-logo.patch .
4546cp $( dirname $0 ) /Hello.desktop .
4647cp $( dirname $0 ) /Hello.xml .
@@ -139,6 +140,23 @@ ${FLATPAK_BUILDER} $FL_GPGARGS --repo=$REPO --force-clean runtimedir \
139140
140141echo " ok runtime build cleanup with build-args"
141142
143+ ${FLATPAK_BUILDER} $FL_GPGARGS --repo=$REPO --force-clean runtimedir \
144+ test-runtime-platform.json >&2
145+
146+ BUILD_GROUP_COUNT=$( grep -c ' ^\[Build\]' runtimedir/metadata.platform)
147+ if [ " $BUILD_GROUP_COUNT " -gt 1 ]; then
148+ echo " not ok no duplicate [Build] groups in platform metadata"
149+ exit 1
150+ fi
151+
152+ BUILT_EXTENSIONS_COUNT=$( grep -c ' ^built-extensions=' runtimedir/metadata.platform)
153+ if [ " $BUILT_EXTENSIONS_COUNT " -gt 1 ]; then
154+ echo " not ok duplicate built-extensions keys in platform metadata"
155+ exit 1
156+ fi
157+
158+ echo " ok no duplicate [Build] groups in platform metadata"
159+
142160# test screenshot ref commit
143161${FLATPAK_BUILDER} --repo=$REPO /repo_sc --force-clean builddir_sc \
144162 --mirror-screenshots-url=https://example.org/media \
Original file line number Diff line number Diff line change 1+ {
2+ "build-runtime" : true ,
3+ "id" : " org.test.Hello.Sdk" ,
4+ "id-platform" : " org.test.Hello.Platform" ,
5+ "runtime" : " org.test.Platform" ,
6+ "sdk" : " org.test.Sdk" ,
7+ "separate-locales" : true ,
8+ "modules" : []
9+ }
You can’t perform that action at this time.
0 commit comments