Move test directory to top level

This is temporary, it should be under `containers/` just as soon
as we have a manifest setup.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

alpine/Makefile

@@ -58,10 +58,8 @@ moby.img: Dockerfile etc usr init
 ../containers/container.img:
 	$(MAKE) -C ../containers
 
-test.img:
-	$(MAKE) -j -C test
-	cat test/container.tar | \
-		docker run --rm --read-only --net=none --log-driver=none --tmpfs /tmp -i $(TAR2INITRD_IMAGE) > $@
+../test/test.img:
+	$(MAKE) -C ../test
 
 kernel/x86_64/kernel.img:
 	$(MAKE) -C kernel
@@ -69,7 +67,7 @@ kernel/x86_64/kernel.img:
 initrd.img: moby.img kernel/x86_64/kernel.img ../containers/container.img
 	cat $^ > $@
 
-initrd-test.img: initrd.img test.img
+initrd-test.img: initrd.img ../test/test.img
 	cat $^ > $@
 
 # outputs tarball of mobylinux-efi.iso mobylinux.efi
@@ -202,7 +200,6 @@ clean:
 	docker images -q moby-azure:raw2vhd | xargs docker rmi -f || true
 	docker volume rm vhdartifact || true
 	$(MAKE) -C packages clean
-	$(MAKE) -C test clean
 	$(MAKE) -C kernel clean
 
 .DELETE_ON_ERROR:

alpine/test/Makefile

@@ -1,18 +0,0 @@
-RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc
-
-TEST_IMAGE=mobylinux/test:fc8e36cbd58b5e9078ae6aa57a348ca2fbec76dc@sha256:7155b16109270dc2d950f63279e5a682b2793b83bb26ff70c4783e6d723db5ba
-
-default: container.tar
-
-container.tar:
-	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock $(RIDDLER) \
-	  $(TEST_IMAGE) /test --cap-drop all --cap-add SYS_ADMIN -e HOME=/tmp \
-	  -v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock:ro \
-	  -v /usr/bin/docker:/usr/bin/docker:ro \
-	  -v /etc/resolv.conf:/etc/resolv.conf:ro \
-	  --net host --read-only $(TEST_IMAGE) /bin/sh /bin/test.sh >$@
-
-clean:
-	rm -f container.tar
-
-.DELETE_ON_ERROR: