From d11fe6ba9a17720df3d3c50a4aa40de0f813c91e Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 19 Jan 2018 13:03:10 +0000
Subject: [PATCH] tests: Adjust docker for mac build test to chance of location

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 .../090_docker_for_mac}/test.sh               |  4 +--
 test/cases/000_build/200_blueprints/group.sh  | 31 -------------------
 test/cases/group.sh                           |  1 -
 3 files changed, 2 insertions(+), 34 deletions(-)
 rename test/cases/000_build/{200_blueprints/010_docker_for_mac => 100_examples/090_docker_for_mac}/test.sh (57%)
 delete mode 100644 test/cases/000_build/200_blueprints/group.sh

diff --git a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh b/test/cases/000_build/100_examples/090_docker_for_mac/test.sh
similarity index 57%
rename from test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
rename to test/cases/000_build/100_examples/090_docker_for_mac/test.sh
index a6e06182b..289a00e5c 100644
--- a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
+++ b/test/cases/000_build/100_examples/090_docker_for_mac/test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SUMMARY: Test the Docker for Mac blueprint
+# SUMMARY: Test the Docker for Mac example
 # LABELS: amd64
 
 set -e
@@ -17,7 +17,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-linuxkit build -name "${NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/docker-ce.yml"
+linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml"
 
 exit 0
 
diff --git a/test/cases/000_build/200_blueprints/group.sh b/test/cases/000_build/200_blueprints/group.sh
deleted file mode 100644
index ca0695d9d..000000000
--- a/test/cases/000_build/200_blueprints/group.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# SUMMARY: Check that the blueprint YAML files work
-# LABELS:
-
-group_init() {
-    # Group initialisation code goes here
-    return 0
-}
-
-group_deinit() {
-    # Group de-initialisation code goes here
-    return 0
-}
-
-CMD=$1
-case $CMD in
-init)
-    group_init
-    res=$?
-    ;;
-deinit)
-    group_deinit
-    res=$?
-    ;;
-*)
-    res=1
-    ;;
-esac
-
-exit $res
-
diff --git a/test/cases/group.sh b/test/cases/group.sh
index 8f0229595..732805cec 100644
--- a/test/cases/group.sh
+++ b/test/cases/group.sh
@@ -11,7 +11,6 @@ group_init() {
     [ -r "${LINUXKIT_TMPDIR}" ] && rm -rf "${LINUXKIT_TMPDIR}"
     mkdir "${LINUXKIT_TMPDIR}"
     echo "export LINUXKIT_EXAMPLES_DIR=${RT_PROJECT_ROOT}/../../examples" >> "${LINUXKIT_TMPDIR}/env.sh"
-    echo "export LINUXKIT_BLUEPRINTS_DIR=${RT_PROJECT_ROOT}/../../blueprints" >> "${LINUXKIT_TMPDIR}/env.sh"
 
     if rt_label_set "gcp"; then
         # If we run GCP tests, make sure it is configured