Merge pull request #219 from heroku/makefile

Makefile

README.md

@@ -209,14 +209,14 @@ Heroku's Cedar and Cedar-14 containers.
 To run the test suite:
 
 ```
-test/docker
+make test
 ```
 
 Or to just test in cedar or cedar-14:
 
 ```
-test/docker cedar
-test/docker cedar-14
+make test-cedar-10
+make test-cedar-14
 ```
 
 The tests are run via the vendored [shunit2](http://shunit2.googlecode.com/svn/trunk/source/2.1/doc/shunit2.html)

makefile

+test: test-cedar-14 test-cedar-10
+
+test-cedar-14:
+	@echo "Running tests in docker (cedar-14)..."
+	@docker run -v $(shell pwd):/buildpack:ro --rm -it heroku/cedar:14 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
+	@echo ""
+
+test-cedar-10:
+	@echo "Running tests in docker (cedar)..."
+	@docker run -v $(shell pwd):/buildpack:ro --rm -it fabiokung/cedar bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'

test/docker

-#!/usr/bin/env bash
-
-cedar-14() {
-  echo "Running tests in docker (cedar-14)..."
-  docker run -v $(pwd):/buildpack:ro --rm -it heroku/cedar:14 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
-  echo ""
-}
-
-cedar() {
-  echo "Running tests in docker (cedar)..."
-  docker run -v $(pwd):/buildpack:ro --rm -it fabiokung/cedar bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
-}
-
-if [ "$1" == "cedar-14" ]; then
-  cedar-14
-elif [ "$1" == "cedar" ]; then
-  cedar
-else
-  cedar-14
-  cedar
-fi