tests: add spread suite for cmake plugin

Move the plugin and snapd integration tests for the CMake plugin into a Spread suite. LP: #1783830 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
canonical · Jul 27, 2018 · 86c9b01 · 86c9b01
1 parent ad7260c
commit 86c9b01
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 119 deletions.
diff --git a/spread.yaml b/spread.yaml
@@ -79,6 +79,8 @@ prepare: |
 restore: $SETUP_DIR/restore.sh
 
 suites:
+ tests/spread/plugins/cmake/:
+   summary: tests of snapcraft's cmake plugin
  tests/spread/plugins/go/:
    summary: tests of snapcraft's plugins
 

diff --git a/tests/integration/plugins/test_cmake_plugin.py b/tests/integration/plugins/test_cmake_plugin.py
diff --git a/tests/integration/snapd/test_cmake_snap.py b/tests/integration/snapd/test_cmake_snap.py
diff --git a/tests/integration/snaps/cmake-hello/icon.png b/tests/integration/snaps/cmake-hello/icon.png
diff --git a/tests/integration/snaps/cmake-hello/test.c b/tests/integration/snaps/cmake-hello/test.c
diff --git a/tests/spread/plugins/cmake/rebuild/task.yaml b/tests/spread/plugins/cmake/rebuild/task.yaml
@@ -0,0 +1,40 @@
+summary: Build and run a basic cmake snap
+
+environment:
+  SNAP_DIR: ../snaps/cmake-with-lib
+
+prepare: |
+  . "$SETUP_DIR/config.sh"
+  set_outdated_step_action "clean"
+
+restore: |
+  . "$SETUP_DIR/config.sh"
+  clear_config
+
+  cd "$SNAP_DIR"
+  snapcraft clean
+  rm -f ./*.snap
+
+execute: |
+  cd "$SNAP_DIR"
+  output="$(snapcraft prime)"
+
+  # Assert that cmake actually configured and built from scratch
+  echo "$output" | MATCH "The CXX compiler identification"
+  echo "$output" | MATCH "Building CXX object CMakeFiles/foo.dir/foo.cpp.o"
+  echo "$output" | MATCH "Building CXX object CMakeFiles/usefoo.dir/main.cpp.o"
+
+  [ "$(./prime/bin/usefoo)" = "foo" ]
+
+  # Modify the source code
+  cp new_foo.cpp src/foo.cpp
+
+  # Prime again. This should rebuild
+  output="$(snapcraft prime)"
+
+  # Assert that cmake did not start from scratch, and reused everything it could
+  echo "$output" | MATCH -v "The CXX compiler identification"
+  echo "$output" | MATCH -v "Building CXX object CMakeFiles/usefoo.dir/main.cpp.o"
+  echo "$output" | MATCH "Building CXX object CMakeFiles/foo.dir/foo.cpp.o"
+
+  [ "$(./prime/bin/usefoo)" = "new foo" ]
diff --git a/tests/spread/plugins/cmake/run/task.yaml b/tests/spread/plugins/cmake/run/task.yaml
@@ -0,0 +1,15 @@
+summary: Build and run a basic cmake snap
+
+environment:
+  SNAP_DIR: ../snaps/cmake-hello
+
+restore: |
+  cd "$SNAP_DIR"
+  snapcraft clean
+  rm -f ./*.snap
+
+execute: |
+  cd "$SNAP_DIR"
+  snapcraft
+  sudo snap install cmake-hello_*.snap --dangerous
+  [ "$(cmake-hello)" = "hello world" ]
diff --git a/...egration/snaps/cmake-hello/CMakeLists.txt → ...ns/cmake/snaps/cmake-hello/CMakeLists.txt b/...egration/snaps/cmake-hello/CMakeLists.txt → ...ns/cmake/snaps/cmake-hello/CMakeLists.txt
diff --git a/...egration/snaps/cmake-hello/snapcraft.yaml → ...ake/snaps/cmake-hello/snap/snapcraft.yaml b/...egration/snaps/cmake-hello/snapcraft.yaml → ...ake/snaps/cmake-hello/snap/snapcraft.yaml
@@ -1,11 +1,12 @@
 name: cmake-hello
-version: 0.1
+version: 1.0
 summary: test the cmake plugin
 description: |
   This is a basic cmake snap. It just prints a hello world.
   If you want to add other functionalities to this snap, please don't.
   Make a new one.
-icon: icon.png
+
+grade: devel
 confinement: strict
 
 build-packages: [gcc, libc6-dev]

diff --git a/tests/spread/plugins/cmake/snaps/cmake-hello/test.c b/tests/spread/plugins/cmake/snaps/cmake-hello/test.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main()
+{
+    printf("hello world\n");
+    return 0;
+}
diff --git a/...egration/snaps/cmake-with-lib/new_foo.cpp → ...ns/cmake/snaps/cmake-with-lib/new_foo.cpp b/...egration/snaps/cmake-with-lib/new_foo.cpp → ...ns/cmake/snaps/cmake-with-lib/new_foo.cpp
diff --git a/.../snaps/cmake-with-lib/snap/snapcraft.yaml → .../snaps/cmake-with-lib/snap/snapcraft.yaml b/.../snaps/cmake-with-lib/snap/snapcraft.yaml → .../snaps/cmake-with-lib/snap/snapcraft.yaml
diff --git a/...n/snaps/cmake-with-lib/src/CMakeLists.txt → ...e/snaps/cmake-with-lib/src/CMakeLists.txt b/...n/snaps/cmake-with-lib/src/CMakeLists.txt → ...e/snaps/cmake-with-lib/src/CMakeLists.txt
diff --git a/...egration/snaps/cmake-with-lib/src/foo.cpp → ...ns/cmake/snaps/cmake-with-lib/src/foo.cpp b/...egration/snaps/cmake-with-lib/src/foo.cpp → ...ns/cmake/snaps/cmake-with-lib/src/foo.cpp
diff --git a/...ntegration/snaps/cmake-with-lib/src/foo.h → ...gins/cmake/snaps/cmake-with-lib/src/foo.h b/...ntegration/snaps/cmake-with-lib/src/foo.h → ...gins/cmake/snaps/cmake-with-lib/src/foo.h
diff --git a/...gration/snaps/cmake-with-lib/src/main.cpp → ...s/cmake/snaps/cmake-with-lib/src/main.cpp b/...gration/snaps/cmake-with-lib/src/main.cpp → ...s/cmake/snaps/cmake-with-lib/src/main.cpp
diff --git a/tests/spread/setup/config.sh b/tests/spread/setup/config.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+export CONFIG_FILE_PATH="$HOME/.config/snapcraft/cli.cfg"
+mkdir -p "$(dirname "$CONFIG_FILE_PATH")"
+
+set_outdated_step_action()
+{
+	cat <<- EOF > "$CONFIG_FILE_PATH"
+		[Lifecycle]
+		outdated_step_action = $1
+		EOF
+}
+
+clear_config()
+{
+	rm -f "$CONFIG_FILE_PATH"
+}