tests/lib: merge distro.sh into pkgdb.sh

snapcore · May 22, 2017 · e55eb41 · e55eb41
1 parent 13815b8
commit e55eb41
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/tests/lib/distro.sh b/tests/lib/distro.sh
diff --git a/tests/lib/pkgdb.sh b/tests/lib/pkgdb.sh
@@ -120,3 +120,14 @@ distro_clean_package_cache() {
             ;;
     esac
 }
+
+# Specify necessary packages which need to be installed on a
+# system to provide a basic build environment for snapd.
+DISTRO_BUILD_DEPS=""
+case "$SPREAD_SYSTEM" in
+    debian-*|ubuntu-*)
+        DISTRO_BUILD_DEPS="build-essential curl devscripts expect gdebi-core jq rng-tools git netcat-openbsd"
+        ;;
+    *)
+        ;;
+esac
diff --git a/tests/lib/prepare-project.sh b/tests/lib/prepare-project.sh
@@ -122,8 +122,6 @@ if [[ "$SPREAD_SYSTEM" == ubuntu-14.04-* ]]; then
     quiet apt-get install -y --force-yes apparmor libapparmor1 seccomp libseccomp2 systemd cgroup-lite util-linux
 fi
 
-. "$TESTSLIB/distro.sh"
-
 distro_purge_package snapd || true
 distro_install_package $DISTRO_BUILD_DEPS