From cb0fff5d8d6b735a7a3a9af37219cb126d61c1b9 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Thu, 25 Aug 2011 13:26:36 -0700
Subject: [PATCH] stop using shelltest

we haven't really been reaping a benefit from it
it doesn't give easy to use output
---
 yesod/test/run.sh                          | 8 +++++++-
 yesod/test/{runscaffold.sh => scaffold.sh} | 0
 yesod/test/scaffold.shelltest              | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
 rename yesod/test/{runscaffold.sh => scaffold.sh} (100%)

diff --git a/yesod/test/run.sh b/yesod/test/run.sh
index c5cd5d97..be8a7304 100755
--- a/yesod/test/run.sh
+++ b/yesod/test/run.sh
@@ -11,7 +11,13 @@ cabal clean && cabal install && cabal sdist
 for f in $(ls -1rt dist/*.tar.gz | tail -1)
 do
   tar -xzvf $f && cd `basename $f .tar.gz` || exit 1
-  shelltest ../test/scaffold.shelltest --color --diff $@ -- --hide-successes
+
+  # shelltest is designed to show you the diff of an expected stdout/stdin. We don't care about that. If it compiles, it compiles
+  # shelltest ../test/scaffold.shelltest --color --diff --all $@ -- --hide-successes
+
+  ../test/scaffold.sh < ../test/sqlite-input.txt &&
+  ../test/scaffold.sh < ../test/postgresql-input.txt &&
+  ../test/scaffold.sh < ../test/tiny-input.txt || (echo "FAILED" && exit 1)
   cd ..
   rm -r `basename $f .tar.gz`
 done
diff --git a/yesod/test/runscaffold.sh b/yesod/test/scaffold.sh
similarity index 100%
rename from yesod/test/runscaffold.sh
rename to yesod/test/scaffold.sh
diff --git a/yesod/test/scaffold.shelltest b/yesod/test/scaffold.shelltest
index 90d73411..39ccefd9 100644
--- a/yesod/test/scaffold.shelltest
+++ b/yesod/test/scaffold.shelltest
@@ -1,3 +1,5 @@
+# Not using this currently!
+#
 # Important! run with test/run.sh
 
 rm -rf foobar && runghc main.hs init && cd foobar && cabal install && cabal install -fdevel && cd ..