[gnome-software/wip/kalev/gnome-3-22: 54/96] trivial: Allow building the flatpak self test data again

[Kalev Lember <klember src gnome org>]

commit 007e667d9eae8f79b3732ae5b7d00561db4405db
Author: Richard Hughes <richard hughsie com>
Date:   Fri Feb 17 11:09:22 2017 +0000

    trivial: Allow building the flatpak self test data again

 data/tests/flatpak/build-flatpak.sh                |    4 ++--
 .../flatpak/chiron/{app => files/bin}/chiron.sh    |    0
 .../share/applications/org.test.Chiron.desktop     |    2 +-
 .../128x128/apps/org.test.Chiron.png}              |  Bin 334 -> 334 bytes
 .../flatpak/org.test.Runtime/files/.gitignore      |    1 +
 .../share/metainfo/org.test.Runtime.metainfo.xml   |   10 ++++++++++
 6 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/data/tests/flatpak/build-flatpak.sh b/data/tests/flatpak/build-flatpak.sh
index 97edddb..ef3e891 100755
--- a/data/tests/flatpak/build-flatpak.sh
+++ b/data/tests/flatpak/build-flatpak.sh
@@ -3,11 +3,11 @@ rm -rf repo
 # build test application
 rm chiron/export -rf
 flatpak build-finish chiron
-flatpak build-export repo chiron
 appstream-compose --origin=flatpak --basename=org.test.Chiron --prefix=chiron/files 
--output-dir=chiron/files/share/app-info/xmls org.test.Chiron
 flatpak build-export repo chiron --update-appstream
 
 # build test runtime
 rm org.test.Runtime/export -rf
 flatpak build-finish org.test.Runtime
-flatpak build-export repo org.test.Runtime --runtime
+appstream-compose --origin=flatpak --basename=org.test.Runtime --prefix=org.test.Runtime/files 
--output-dir=org.test.Runtime/files/share/app-info/xmls org.test.Runtime
+flatpak build-export repo org.test.Runtime --runtime --update-appstream
diff --git a/data/tests/flatpak/chiron/app/chiron.sh b/data/tests/flatpak/chiron/files/bin/chiron.sh
old mode 100644
new mode 100755
similarity index 100%
rename from data/tests/flatpak/chiron/app/chiron.sh
rename to data/tests/flatpak/chiron/files/bin/chiron.sh
diff --git a/data/tests/flatpak/chiron/files/share/applications/org.test.Chiron.desktop 
b/data/tests/flatpak/chiron/files/share/applications/org.test.Chiron.desktop
index 5e54081..2fbdf95 100644
--- a/data/tests/flatpak/chiron/files/share/applications/org.test.Chiron.desktop
+++ b/data/tests/flatpak/chiron/files/share/applications/org.test.Chiron.desktop
@@ -2,5 +2,5 @@
 Type=Application
 Name=Chiron
 Exec=chiron.sh
-Icon=chiron
+Icon=org.test.Chiron
 Keywords=Bingo;
diff --git a/data/tests/flatpak/org.test.Runtime/files/.gitignore 
b/data/tests/flatpak/org.test.Runtime/files/.gitignore
new file mode 100644
index 0000000..3600b9c
--- /dev/null
+++ b/data/tests/flatpak/org.test.Runtime/files/.gitignore
@@ -0,0 +1 @@
+app-info
diff --git a/data/tests/flatpak/org.test.Runtime/files/share/metainfo/org.test.Runtime.metainfo.xml 
b/data/tests/flatpak/org.test.Runtime/files/share/metainfo/org.test.Runtime.metainfo.xml
new file mode 100644
index 0000000..5d68c60
--- /dev/null
+++ b/data/tests/flatpak/org.test.Runtime/files/share/metainfo/org.test.Runtime.metainfo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017 Richard Hughes <richard hughsie com> -->
+<component type="runtime">
+  <id>org.test.Runtime</id>
+  <metadata_license>CC0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>Test runtime</name>
+  <summary>Test runtime for flatpak self tests</summary>
+</component>
+