From c36350ade89844cd05ece165f06f60ec40bcfcc4 Mon Sep 17 00:00:00 2001
From: Peter Braden <peterbraden@peterbraden.co.uk>
Date: Wed, 11 Feb 2015 18:32:25 +0100
Subject: [PATCH] Move smoke test into makefile

---
 Makefile       | 14 +++++++++-----
 smoke/smoke.sh | 14 --------------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100755 smoke/smoke.sh

diff --git a/Makefile b/Makefile
index 129b06f..bcacd40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,15 @@
 VERSION := $(shell node -e "console.log(require('./package.json').version)")
 
-.PHONY: default release
+.PHONY: default release smoke
+
+test:
+	npm test
+
+smoke:
+	npm install --build-from-source
+	node smoke/smoketest.js
+	npm test
 
-# Add a default task so we don't release just because someone ran 'make'
-default:
-	@echo "Did you mean to release a new version?"
-	@echo "If so, run 'make release'."
 
 release:
 	@echo "Tagging release $(VERSION)"
diff --git a/smoke/smoke.sh b/smoke/smoke.sh
deleted file mode 100755
index 84fab84..0000000
--- a/smoke/smoke.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [ ! -f smoke/smoketest.js ]; then
-	echo "Please run smoke test from the top-level folder of the repository." >&2
-	exit 1
-fi
-
-node-gyp build && echo '-- Compiled OK -- 
-
-' && node  smoke/smoketest.js && echo '-- Smoke Done, running tests --
-
-' && npm test # && echo '-- Tests Run, runnning examples --
-#(building example data)
-#' && ./examples/make-example-files.sh && node examples/motion-track.js