diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -1,51 +1,55 @@ -**1.3.3** (2014/5/25) +1.3.4 (2014/5/28) + * drop cabal-file-th, support GHC 7.8.2 + +1.3.3 (2014/5/25) + * allow process 1.2, regex-tdfa-1.2 * add a hackage-compatible changelog -**1.3.2** (2013/11/13) +1.3.2 (2013/11/13) * increase upper bound on Diff package -**1.3.1** (2012/12/28) +1.3.1 (2012/12/28) * fix cabal file typo breaking the build -**1.3** (2012/12/28) +1.3 (2012/12/28) * support latest Diff, cmdargs, test-framework; tested with GHC 7.6.1 (Magnus Therning) * fix unicode handling on GHC >= 7.2 -**1.2.1** (2012/3/12) +1.2.1 (2012/3/12) * use the more up-to-date filemanip package for easier Debian packaging -**1.2** (2012/2/26) +1.2 (2012/2/26) * support latest cmdargs, test-framework, and GHC 7.4 - * more readable non-quoted failure output by default; for quoted output, use `-p/--precise` - * the `--all`, `--diff` and `--precise` options now interact well + * more readable non-quoted failure output by default; for quoted output, use -p/--precise + * the --all, --diff and --precise options now interact well -**1.1** (2011/8/25) +1.1 (2011/8/25) * bump process dependency to allow building with GHC 7.2.1 - * new `-a/--all` flag shows all failure output without truncating + * new -a/--all flag shows all failure output without truncating -**1.0** (2011/7/23) +1.0 (2011/7/23) * New home page/docs - * The `>>>=` field is now required; you may need to add it to your existing tests - * Input and expected output can now contain lines beginning with `#` + * The >>>= field is now required; you may need to add it to your existing tests + * Input and expected output can now contain lines beginning with # * Multiple tests in a file may now have whitespace between them - * The `-i/--implicit` option has been dropped - * New `-d/--diff` option shows test failures as a unified diff when possible, including line numbers to help locate the problem - * New `-x/--exclude` option skips certain test files (eg platform-specific ones) + * The -i/--implicit option has been dropped + * New -d/--diff option shows test failures as a unified diff when possible, including line numbers to help locate the problem + * New -x/--exclude option skips certain test files (eg platform-specific ones) * Passing arguments through to test-framework is now more robust * Fixed: parsing could fail when input contained left angle brackets * Fixed: some test files generated an extra blank test at the end -**0.9** (2010/9/3) +0.9 (2010/9/3) * show plain non-ansi output by default, add --color option * better handling of non-ascii test data. We assume that non-ascii file @@ -64,7 +68,7 @@ still issues on windows/wine but in theory this will help. * tighten up dependencies -**0.8** (2010/4/9) +0.8 (2010/4/9) * rename executable to shelltest. The package might also be renamed at some point. * better built-in help @@ -77,11 +81,11 @@ --execdir execute tested command in same directory as test file --extension=EXT file extension of test files (default=.test) -**0.7** (2010/3/5) +0.7 (2010/3/5) * more robust parsing - --debug-parse parses test files and stops - - regexps now support escaped forward slash (`\/`) + - regexps now support escaped forward slash (\/) - bad regexps now fail at startup - command-line arguments are required in a test, and may be blank - a >>>= is no longer required to separate multiple tests in a file @@ -98,15 +102,15 @@ * more flexible --implicit flag * switch to the more robust and faster pcre-light regexp lib -**0.6** (2009/7/15) +0.6 (2009/7/15) * allow multiple tests per file, handle bad executable better -**0.5** (2009/7/14) +0.5 (2009/7/14) * show failure output in proper order -**0.4** (2009/7/14) +0.4 (2009/7/14) * run commands in a more robust way to avoid hangs This fixes hanging when a command generates large output, and hopefully @@ -118,14 +122,14 @@ * disallow interspersed foreign options which confused parseargs * change comment character to # -**0.3** (2009/7/11) +0.3 (2009/7/11) * misc. bugfixes/improvements -**0.2** (2009/7/10) +0.2 (2009/7/10) * bugfix, build with -threaded -**0.1** (2009/7/10) +0.1 (2009/7/10) * shelltestrunner, a generic shell command stdout/stderr/exit status tester diff --git a/shelltest.hs b/shelltest.hs --- a/shelltest.hs +++ b/shelltest.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveDataTypeable, TemplateHaskell, CPP #-} +{-# LANGUAGE DeriveDataTypeable, CPP #-} {- | shelltest - a tool for testing command-line programs. @@ -16,6 +16,7 @@ import Control.Monad (liftM,when,unless) import Data.List import Data.Maybe (isNothing,isJust,fromJust,catMaybes) +import Data.Version (showVersion) import qualified Test.HUnit (Test) import System.Console.CmdArgs import System.Exit @@ -34,17 +35,16 @@ import qualified System.FilePath.Find as Find (extension) import Control.Applicative ((<$>)) import Data.Algorithm.Diff -import Distribution.PackageDescription.TH (packageVariable, package, pkgVersion) import PlatformString (fromPlatformString, toPlatformString) +import Paths_shelltestrunner (version) strace :: Show a => a -> a strace a = trace (show a) a -progname, version, progversion :: String +progname, progversion :: String progname = "shelltest" -version = $(packageVariable (pkgVersion . package)) -progversion = progname ++ " " ++ version +progversion = progname ++ " " ++ showVersion version proghelpsuffix :: [String] proghelpsuffix = [ -- keep this bit synced with options width diff --git a/shelltestrunner.cabal b/shelltestrunner.cabal --- a/shelltestrunner.cabal +++ b/shelltestrunner.cabal @@ -1,6 +1,6 @@ name: shelltestrunner --- sync with README.md, ANNOUNCE: -version: 1.3.3 +-- sync with: CHANGES [ANNOUNCE] +version: 1.3.4 category: Testing synopsis: A tool for testing command-line programs. description: @@ -16,7 +16,7 @@ homepage: http://joyful.com/shelltestrunner bug-reports: mailto:simon@joyful.com stability: stable -tested-with: GHC==7.6.3 +tested-with: GHC==7.8.2 cabal-version: >= 1.6 build-type: Simple @@ -30,7 +30,6 @@ ghc-options: -threaded -W -fwarn-tabs build-depends: base >= 4 && < 5 - ,cabal-file-th ,filemanip >= 0.3 && < 0.4 ,HUnit < 1.3 ,cmdargs >= 0.7 && < 0.11