Merge pull request #20 from obfusk/fix-tests-and-cabal

improve bash tests & fix extra-source-files

Author: simonmichael

Makefile

@@ -71,8 +71,11 @@ testwindows:
 testexamples: build
 	$(SHELLTEST) tests/examples
 
+# run tests that require --shell /bin/bash
 testbash: build
+	@echo fail when run with /bin/sh
 	! $(SHELLTEST) tests/bash
+	@echo succeed when run with /bin/bash
 	$(SHELLTEST) tests/bash --shell /bin/bash
 
 # run shell tests with several ghc versions
@@ -94,7 +97,7 @@ html: $(patsubst %.md,%.html,$(wildcard *.md)) Makefile
 
 # generate html from a md file
 %.html: %.md #index.tmpl
-	$(PANDOC) $< -o $@ #--template index.tmpl 
+	$(PANDOC) $< -o $@ #--template index.tmpl
 
 # regenerate html files when the corresponding markdown file changes
 liverender:

shelltestrunner.cabal

@@ -24,19 +24,29 @@ build-type:     Simple
 
 extra-tmp-files:
 extra-source-files:
-  README.md
-  CHANGES
   ANNOUNCE
-  tests/format1/*.test
+  CHANGES
+  Makefile
+  README.md
+  tests/README
+  tests/bash/*.test
+  tests/examples/*.test
+  tests/examples/README
   tests/format1.unix/*.test
   tests/format1.windows/*.test
-  tests/format2/*.test
+  tests/format1/*.test
+  tests/format1/abstract-test-with-macros
+  tests/format1/one-failing-test
   tests/format2.unix/*.test
   tests/format2.windows/*.test
-  tests/format3/*.test
+  tests/format2/*.test
+  tests/format2/abstract-test-with-macros
+  tests/format2/one-failing-test
   tests/format3.unix/*.test
   tests/format3.windows/*.test
-  tests/examples/*.test
+  tests/format3/*.test
+  tests/format3/abstract-test-with-macros
+  tests/format3/one-failing-test
 
 executable shelltest
   ghc-options: -threaded -W -fwarn-tabs

tests/bash/dollar-quote.test

@@ -1,3 +1,6 @@
+# Test bash-only $'...' syntax.
+# This only works when run with --shell /bin/bash
+# See also: https://github.com/simonmichael/shelltestrunner/issues/15
 echo $'\'o\' `elem` p'
 >>>
 'o' `elem` p

tests/bash/process-substitution.test

@@ -0,0 +1,9 @@
+# Test bash-only <( ... ) syntax.
+# This only works when run with --shell /bin/bash
+diff <( echo foo ) <( echo bar )
+>>>
+1c1
+< foo
+---
+> bar
+>>>= 1