File tree Expand file tree Collapse file tree 3 files changed +36
-1
lines changed
Expand file tree Collapse file tree 3 files changed +36
-1
lines changed Original file line number Diff line number Diff line change @@ -123,6 +123,7 @@ if get_option('installed_tests')
123123 ' org.flatpak.appstream_media.json' ,
124124 ' org.test.Hello-256.png' ,
125125 ' org.flatpak.install_test.json' ,
126+ ' test-locale-cleanup.json' ,
126127
127128 install_dir : installed_testdir,
128129 install_mode : ' rw-r--r--' ,
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ set -euo pipefail
2323
2424skip_without_fuse
2525
26- echo " 1..11 "
26+ echo " 1..12 "
2727
2828setup_repo
2929install_repo
@@ -56,6 +56,7 @@ cp $(dirname $0)/org.test.Hello.png .
5656cp $( dirname $0 ) /org.test.Hello-256.png .
5757cp $( dirname $0 ) /org.flatpak.appstream_media.json .
5858cp $( dirname $0 ) /org.flatpak.install_test.json .
59+ cp $( dirname $0 ) /test-locale-cleanup.json .
5960mkdir include1
6061cp $( dirname $0 ) /module1.json include1/
6162cp $( dirname $0 ) /module1.yaml include1/
@@ -184,3 +185,10 @@ echo "$REFS" | grep -q "org\.flatpak\.install_test\.Debug"
184185echo " $REFS " | grep -q " org\.flatpak\.install_test\.Locale"
185186
186187echo " ok install"
188+
189+ ${FLATPAK_BUILDER} --repo=$REPO --force-clean appdir test-locale-cleanup.json >&2
190+
191+ assert_not_has_file appdir/files/share/runtime/locale/es/share/es/testA.mo
192+ assert_has_file appdir/files/share/runtime/locale/es/share/es/testB.mo
193+
194+ echo " ok testB's locale survives after testA's cleanup"
Original file line number Diff line number Diff line change 1+ {
2+ "app-id" : " org.test.LocaleCleanup" ,
3+ "runtime" : " org.test.Platform" ,
4+ "sdk" : " org.test.Sdk" ,
5+ "modules" : [
6+ {
7+ "name" : " testA" ,
8+ "cleanup" : [
9+ " /share/locale"
10+ ],
11+ "buildsystem" : " simple" ,
12+ "build-commands" : [
13+ " mkdir -p /app/share/locale/es" ,
14+ " touch /app/share/locale/es/testA.mo"
15+ ]
16+ },
17+ {
18+ "name" : " testB" ,
19+ "buildsystem" : " simple" ,
20+ "build-commands" : [
21+ " mkdir -p /app/share/locale/es" ,
22+ " touch /app/share/locale/es/testB.mo"
23+ ]
24+ }
25+ ]
26+ }
You can’t perform that action at this time.
0 commit comments