tests: add spread suite for meson plugin

Move the plugin integration tests for the Meson plugin into a Spread suite. LP: #1783837 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
canonical · Aug 9, 2018 · 605fa3f · 605fa3f
1 parent 10139a4
commit 605fa3f
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 42 deletions.
diff --git a/spread.yaml b/spread.yaml
@@ -186,6 +186,8 @@ suites:
    summary: tests of snapcraft's Go plugin
  tests/spread/plugins/kbuild/:
    summary: tests of snapcraft's Kbuild plugin
+ tests/spread/plugins/meson/:
+   summary: tests of snapcraft's Meson plugin
  tests/spread/plugins/nil/:
    summary: tests of snapcraft's Nil plugin
 

diff --git a/tests/integration/plugins/test_meson_plugin.py b/tests/integration/plugins/test_meson_plugin.py
diff --git a/tests/integration/snaps/meson-hello/main.c b/tests/integration/snaps/meson-hello/main.c
diff --git a/tests/integration/snaps/meson-hello/meson.build b/tests/integration/snaps/meson-hello/meson.build
diff --git a/tests/spread/plugins/meson/run/task.yaml b/tests/spread/plugins/meson/run/task.yaml
@@ -0,0 +1,18 @@
+summary: Build and run a basic meson snap
+
+environment:
+  SNAP_DIR: ../snaps/meson-hello
+
+restore: |
+  cd "$SNAP_DIR"
+  snapcraft clean
+  rm -f ./*.snap
+
+# There is no meson on trusty
+systems: [-ubuntu-14.04*]
+
+execute: |
+  cd "$SNAP_DIR"
+  snapcraft
+  sudo snap install meson-hello_*.snap --dangerous
+  [ "$(meson-hello)" = "hello world" ]
diff --git a/tests/spread/plugins/meson/snaps/meson-hello/main.c b/tests/spread/plugins/meson/snaps/meson-hello/main.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main()
+{
+    printf("hello world\n");
+    return 0;
+}
diff --git a/tests/spread/plugins/meson/snaps/meson-hello/meson.build b/tests/spread/plugins/meson/snaps/meson-hello/meson.build
@@ -0,0 +1,2 @@
+project('meson-hello', 'c')
+executable('hello', 'main.c', install : true)
diff --git a/...egration/snaps/meson-hello/snapcraft.yaml → ...son/snaps/meson-hello/snap/snapcraft.yaml b/...egration/snaps/meson-hello/snapcraft.yaml → ...son/snaps/meson-hello/snap/snapcraft.yaml
@@ -1,17 +1,22 @@
 name: meson-hello
-version: 0.1
+version: '1.0'
 summary: test the meson plugin
 description: |
   This is a basic meson snap. It just prints a hello world.
   If you want to add other functionalities to this snap, please don't.
   Make a new one.
+
+grade: devel
 confinement: strict
 
-build-packages: [gcc, libc6-dev]
+apps:
+  meson-hello:
+    command: hello
 
 parts:
   meson-project:
-    meson-parameters:
-      - --prefix=/opt
     plugin: meson
     source: .
+    meson-parameters:
+      - --prefix=/
+    build-packages: [gcc, libc6-dev]