cabal-cargs 0.2 → 0.3
raw patch · 37 files changed
+105/−110 lines, 37 files
Files
- README.md +3/−4
- cabal-cargs.cabal +2/−1
- lib/CabalCargs/BuildInfo.hs +1/−0
- lib/CabalCargs/CompilerArgs.hs +23/−32
- lib/CabalCargs/Field.hs +2/−0
- lib/CabalCargs/Format.hs +3/−16
- tests/diffOutputsWithGoldens +10/−0
- tests/goldenFiles/withSandbox/FindCabalFilePure.txt +1/−1
- tests/goldenFiles/withSandbox/FromCabalFilePure.txt +1/−1
- tests/goldenFiles/withSandbox/FromExeSrcFilePure.txt +1/−1
- tests/goldenFiles/withSandbox/FromLibSrcPure.txt +1/−1
- tests/goldenFiles/withSandbox/OnlyGhcOptionsOfExe.txt +1/−1
- tests/goldenFiles/withSandbox/OnlyGhcOptionsOfLib.txt +1/−1
- tests/goldenFiles/withSandbox/OnlyGhcOptionsOfTest.txt +1/−1
- tests/goldenFiles/withoutSandbox/AllOfExe.txt +1/−1
- tests/goldenFiles/withoutSandbox/AllOfLib.txt +1/−1
- tests/goldenFiles/withoutSandbox/AllOfTest.txt +1/−1
- tests/goldenFiles/withoutSandbox/DisableFlag.txt +1/−1
- tests/goldenFiles/withoutSandbox/EnableAndDisableFlag.txt +1/−1
- tests/goldenFiles/withoutSandbox/EnableFlag.txt +1/−1
- tests/goldenFiles/withoutSandbox/FindCabalFile.txt +1/−1
- tests/goldenFiles/withoutSandbox/FindCabalFileHdevtools.txt +1/−1
- tests/goldenFiles/withoutSandbox/FindCabalFilePure.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromCabalFile.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromCabalFileHdevtools.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromCabalFilePure.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromExeSrcFile.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromExeSrcFileHdevtools.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromExeSrcFilePure.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromLibSrcFile.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromLibSrcFileHdevtools.txt +1/−1
- tests/goldenFiles/withoutSandbox/FromLibSrcPure.txt +1/−1
- tests/goldenFiles/withoutSandbox/OnlyGhcOptionsOfExe.txt +1/−1
- tests/goldenFiles/withoutSandbox/OnlyGhcOptionsOfLib.txt +1/−1
- tests/goldenFiles/withoutSandbox/OnlyGhcOptionsOfTest.txt +1/−1
- tests/mkGoldens +28/−26
- tests/takeOutputsAsGoldens +5/−3
README.md view
@@ -111,13 +111,12 @@ * `autogen_hs_source_dirs` * `autogen_include_dirs` * `autogen_includes`+* `hdevtools_socket` It's not quite true, that all fields are printed out if not constrained, that's only the case for the `pure` formatting option. For the other formatting options-currently the fields `c_sources`, `extra_libraries` and `ld_options` are ignored. --Also there's one special field for `hdevtools` which is always printed out:-the used socket file.+currently the fields `c_sources`, `extra_libraries` and `ld_options` are ignored+and additionally the `ghc` formatting option ignores the `hdevtools_socket` field. Flags =====
cabal-cargs.cabal view
@@ -1,5 +1,5 @@ name: cabal-cargs-version: 0.2+version: 0.3 cabal-version: >=1.9.2 build-type: Simple license: BSD3@@ -14,6 +14,7 @@ README.md tests/mkGoldens tests/takeOutputsAsGoldens+ tests/diffOutputsWithGoldens tests/inputFiles/withoutSandbox/test.cabal tests/inputFiles/withoutSandbox/dist/.gitignore tests/inputFiles/withoutSandbox/exe/Source.hs
lib/CabalCargs/BuildInfo.hs view
@@ -137,6 +137,7 @@ field F.Autogen_Hs_Source_Dirs = nopLens field F.Autogen_Include_Dirs = nopLens field F.Autogen_Includes = nopLens+field F.Hdevtools_Socket = nopLens -- | A lens that merges the fields 'default-extensions' and 'extensions',
lib/CabalCargs/CompilerArgs.hs view
@@ -14,7 +14,6 @@ import qualified CabalCargs.Fields as Fs import qualified CabalCargs.BuildInfo as B import Data.List (nub, foldl')-import Data.Maybe (maybeToList) import Control.Applicative ((<$>)) import Control.Lens import qualified Filesystem.Path.CurrentOS as FP@@ -41,8 +40,7 @@ , autogenHsSourceDirs :: [FilePath] -- ^ dirs of automatically generated haskell source files by cabal (e.g. Paths_*) , autogenIncludeDirs :: [FilePath] -- ^ dirs of automatically generated include files by cabal , autogenIncludes :: [String] -- ^ automatically generated include files by cabal (e.g. cabal_macros.h)- , cabalFile :: FilePath -- ^ path to the used cabal file- , relativePaths :: Bool -- ^ if all returned paths are relative to the directory of the cabal file, otherwise all paths are absolute+ , hdevtoolsSocket :: Maybe FilePath -- ^ the path to the hdevtools socket file } deriving (Show, Eq) @@ -59,9 +57,11 @@ , ("ldOptions" , "ldOptionsL") , ("includeDirs" , "includeDirsL") , ("includes" , "includesL")+ , ("packageDB" , "packageDBL") , ("autogenHsSourceDirs", "autogenHsSourceDirsL") , ("autogenIncludeDirs" , "autogenIncludeDirsL") , ("autogenIncludes" , "autogenIncludesL")+ , ("hdevtoolsSocket" , "hdevtoolsSocketL") ] ''CompilerArgs type Error = String@@ -77,28 +77,25 @@ fromSpec spec = case Spec.sections spec of S.Sections sections ->- setCabalFile $ absolutePaths $ foldl' collectFromSection compilerArgs sections+ absolutePaths $ foldl' collectFromSection defaultCompilerArgs sections S.AllSections ->- setCabalFile $ absolutePaths $ collectFields buildInfos compilerArgs+ absolutePaths $ collectFields buildInfos defaultCompilerArgs where- compilerArgs = defaultCompilerArgs { relativePaths = Spec.relativePaths spec }-- setCabalFile cargs = cargs { cabalFile = Spec.cabalFile spec }- absolutePaths cargs | Spec.relativePaths spec = cargs | otherwise- = cargs & hsSourceDirsL %~ map prependCabalDir- & cSourcesL %~ map prependCabalDir- & extraLibDirsL %~ map prependCabalDir- & includeDirsL %~ map prependCabalDir- & autogenHsSourceDirsL %~ map prependCabalDir- & autogenIncludeDirsL %~ map prependCabalDir- & packageDBL %~ map prependCabalDir+ = cargs & hsSourceDirsL %~ map prependCabalDir+ & cSourcesL %~ map prependCabalDir+ & extraLibDirsL %~ map prependCabalDir+ & includeDirsL %~ map prependCabalDir+ & autogenHsSourceDirsL %~ map prependCabalDir+ & autogenIncludeDirsL %~ map prependCabalDir+ & packageDBL . _Just %~ prependCabalDir+ & hdevtoolsSocketL . _Just %~ prependCabalDir where prependCabalDir path = FP.encodeString $ cabalDir </> FP.decodeString path cabalDir = FP.directory . FP.decodeString $ Spec.cabalFile spec@@ -110,7 +107,7 @@ foldl' (addCarg buildInfos) cargs fields where addCarg _ cargs F.Package_Db =- cargs & packageDBL .~ (maybeToList $ Spec.packageDB spec)+ cargs & packageDBL .~ Spec.packageDB spec addCarg _ cargs F.Autogen_Hs_Source_Dirs | Just distDir <- Spec.distDir spec@@ -133,28 +130,22 @@ | otherwise = cargs + addCarg _ cargs F.Hdevtools_Socket =+ cargs & hdevtoolsSocketL .~ Just ".hdevtools.sock"+ addCarg buildInfos cargs field = cargs & (fieldL field) %~ nub . (++ buildInfoFields) where buildInfoFields = concat $ map (^. B.field field) buildInfos - fields = case Spec.fields spec of- Fs.Fields fs -> fs- _ -> F.allFields+ fields = case Spec.fields spec of+ Fs.Fields fs -> fs+ _ -> F.allFields buildInfos = B.buildInfos (Spec.condVars spec) (Spec.cabalPackage spec) buildInfosOf section = B.buildInfosOf section (Spec.condVars spec) (Spec.cabalPackage spec) -packageDBL :: Lens' CompilerArgs [String]-packageDBL = lens getter setter- where- getter = maybeToList . packageDB-- setter cargs [db@(_:_)] = cargs { packageDB = Just db }- setter cargs _ = cargs-- fieldL :: F.Field -> Lens' CompilerArgs [String] fieldL F.Hs_Source_Dirs = hsSourceDirsL fieldL F.Ghc_Options = ghcOptionsL@@ -168,10 +159,11 @@ fieldL F.Ld_Options = ldOptionsL fieldL F.Include_Dirs = includeDirsL fieldL F.Includes = includesL-fieldL F.Package_Db = packageDBL+fieldL F.Package_Db = error $ "Unexpected field Package_Db for CabalCargs.CompilerArgs.fieldL!" fieldL F.Autogen_Hs_Source_Dirs = autogenHsSourceDirsL fieldL F.Autogen_Include_Dirs = autogenIncludeDirsL fieldL F.Autogen_Includes = autogenIncludesL+fieldL F.Hdevtools_Socket = error $ "Unexpected field Hdevtools_Socket for CabalCargs.CompilerArgs.fieldL!" defaultCompilerArgs :: CompilerArgs@@ -188,10 +180,9 @@ , ldOptions = [] , includeDirs = [] , includes = []- , cabalFile = "" , packageDB = Nothing , autogenHsSourceDirs = [] , autogenIncludeDirs = [] , autogenIncludes = []- , relativePaths = False+ , hdevtoolsSocket = Nothing }
lib/CabalCargs/Field.hs view
@@ -29,6 +29,8 @@ | Autogen_Hs_Source_Dirs -- ^ dirs of automatically generated haskell source files by cabal (e.g. Paths_*) | Autogen_Include_Dirs -- ^ dirs of automatically generated include files by cabal | Autogen_Includes -- ^ automatically generated include files by cabal (e.g. cabal_macros.h)++ | Hdevtools_Socket -- ^ the socket file for hdevtools deriving (Data, Typeable, Show, Eq, Enum, Bounded)
lib/CabalCargs/Format.hs view
@@ -8,8 +8,6 @@ import CabalCargs.Formatting (Formatting(..)) import Data.Maybe (maybeToList) import Data.List (foldl')-import qualified Filesystem.Path.CurrentOS as FP-import Filesystem.Path ((</>)) format :: Formatting -> CompilerArgs -> [String]@@ -23,7 +21,7 @@ , map ("-l" ++) (extraLibraries cargs) , formatIncludeDirs $ includeDirs cargs , formatIncludes $ includes cargs- , maybe [""] (\db -> ["-package-conf=" ++ db]) (packageDB cargs)+ , maybe [] (\db -> ["-package-conf=" ++ db]) (packageDB cargs) , formatHsSourceDirs $ autogenHsSourceDirs cargs , formatIncludeDirs $ autogenIncludeDirs cargs , formatIncludes $ autogenIncludes cargs@@ -39,13 +37,7 @@ format Hdevtools cargs = (map ("-g" ++) (format Ghc cargs)) ++ socket where- socket = ["--socket=" ++ socketFile]- socketFile- | relativePaths cargs- = ".hdevtools.sock"-- | otherwise- = prependCabalDir cargs ".hdevtools.sock"+ socket = maybe [] (\s -> ["--socket=" ++ s]) (hdevtoolsSocket cargs) format Pure cargs = concat [ hsSourceDirs cargs@@ -64,10 +56,5 @@ , autogenHsSourceDirs cargs , autogenIncludeDirs cargs , autogenIncludes cargs+ , maybeToList $ hdevtoolsSocket cargs ]---prependCabalDir :: CompilerArgs -> String -> String-prependCabalDir cargs path = FP.encodeString $ cabalDir </> (FP.decodeString path)- where- cabalDir = FP.directory $ FP.decodeString (cabalFile cargs)
+ tests/diffOutputsWithGoldens view
@@ -0,0 +1,10 @@+#!/usr/bin/env bash+dirs="withSandbox withoutSandbox"+for dir in $dirs ; do+ for output in `ls outputFiles/$dir` ; do+ outputFile=outputFiles/$dir/$output+ goldenFile=goldenFiles/$dir/$output+ # only call gvimdiff on files having a difference+ diff $outputFile $goldenFile > /dev/null || gvimdiff -f $outputFile $goldenFile+ done+done
tests/goldenFiles/withSandbox/FindCabalFilePure.txt view
@@ -1,1 +1,1 @@-lib exe tests -W -DLIB -DEXE .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h+lib exe tests -W -DLIB -DEXE .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withSandbox/FromCabalFilePure.txt view
@@ -1,1 +1,1 @@-lib exe tests -W -DLIB -DEXE .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h+lib exe tests -W -DLIB -DEXE .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withSandbox/FromExeSrcFilePure.txt view
@@ -1,1 +1,1 @@-exe -W -DEXE .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h+exe -W -DEXE .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withSandbox/FromLibSrcPure.txt view
@@ -1,1 +1,1 @@-lib -W -DLIB .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h+lib -W -DLIB .cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d dist/dist-sandbox-6d1acfa0/build/autogen dist/dist-sandbox-6d1acfa0/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withSandbox/OnlyGhcOptionsOfExe.txt view
@@ -1,1 +1,1 @@--W +-W
tests/goldenFiles/withSandbox/OnlyGhcOptionsOfLib.txt view
@@ -1,1 +1,1 @@--W +-W
tests/goldenFiles/withSandbox/OnlyGhcOptionsOfTest.txt view
@@ -1,1 +1,1 @@--W +-W
tests/goldenFiles/withoutSandbox/AllOfExe.txt view
@@ -1,1 +1,1 @@--iexe -W -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-iexe -W -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/AllOfLib.txt view
@@ -1,1 +1,1 @@--ilib -W -optP-DLIB -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-ilib -W -optP-DLIB -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/AllOfTest.txt view
@@ -1,1 +1,1 @@--itests -W -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-itests -W -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/DisableFlag.txt view
@@ -1,1 +1,1 @@--ilib -iexe -itests -W -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-ilib -iexe -itests -W -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/EnableAndDisableFlag.txt view
@@ -1,1 +1,1 @@--ilib -iexe -itests -W -optP-DEXE -optP-DTEST -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-ilib -iexe -itests -W -optP-DEXE -optP-DTEST -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/EnableFlag.txt view
@@ -1,1 +1,1 @@--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -optP-DTEST -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -optP-DTEST -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/FindCabalFile.txt view
@@ -1,1 +1,1 @@--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/FindCabalFileHdevtools.txt view
@@ -1,1 +1,1 @@--g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock+-g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
tests/goldenFiles/withoutSandbox/FindCabalFilePure.txt view
@@ -1,1 +1,1 @@-lib exe tests -W -DLIB -DEXE dist/build/autogen dist/build/autogen cabal_macros.h+lib exe tests -W -DLIB -DEXE dist/build/autogen dist/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withoutSandbox/FromCabalFile.txt view
@@ -1,1 +1,1 @@--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/FromCabalFileHdevtools.txt view
@@ -1,1 +1,1 @@--g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock+-g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
tests/goldenFiles/withoutSandbox/FromCabalFilePure.txt view
@@ -1,1 +1,1 @@-lib exe tests -W -DLIB -DEXE dist/build/autogen dist/build/autogen cabal_macros.h+lib exe tests -W -DLIB -DEXE dist/build/autogen dist/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withoutSandbox/FromExeSrcFile.txt view
@@ -1,1 +1,1 @@--iexe -W -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-iexe -W -optP-DEXE -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/FromExeSrcFileHdevtools.txt view
@@ -1,1 +1,1 @@--g-iexe -g-W -g-optP-DEXE -g -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock+-g-iexe -g-W -g-optP-DEXE -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
tests/goldenFiles/withoutSandbox/FromExeSrcFilePure.txt view
@@ -1,1 +1,1 @@-exe -W -DEXE dist/build/autogen dist/build/autogen cabal_macros.h+exe -W -DEXE dist/build/autogen dist/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withoutSandbox/FromLibSrcFile.txt view
@@ -1,1 +1,1 @@--ilib -W -optP-DLIB -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h+-ilib -W -optP-DLIB -idist/build/autogen -Idist/build/autogen -optP-include -optPcabal_macros.h
tests/goldenFiles/withoutSandbox/FromLibSrcFileHdevtools.txt view
@@ -1,1 +1,1 @@--g-ilib -g-W -g-optP-DLIB -g -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock+-g-ilib -g-W -g-optP-DLIB -g-idist/build/autogen -g-Idist/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
tests/goldenFiles/withoutSandbox/FromLibSrcPure.txt view
@@ -1,1 +1,1 @@-lib -W -DLIB dist/build/autogen dist/build/autogen cabal_macros.h+lib -W -DLIB dist/build/autogen dist/build/autogen cabal_macros.h .hdevtools.sock
tests/goldenFiles/withoutSandbox/OnlyGhcOptionsOfExe.txt view
@@ -1,1 +1,1 @@--W +-W
tests/goldenFiles/withoutSandbox/OnlyGhcOptionsOfLib.txt view
@@ -1,1 +1,1 @@--W +-W
tests/goldenFiles/withoutSandbox/OnlyGhcOptionsOfTest.txt view
@@ -1,1 +1,1 @@--W +-W
tests/mkGoldens view
@@ -1,32 +1,34 @@ #!/usr/bin/env bash-dir=$1-cabal-cargs --relative --sourcefile=inputFiles/$dir/lib > goldenFiles/$dir/FindCabalFile.txt-cabal-cargs --relative --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/FromCabalFile.txt-cabal-cargs --relative --sourcefile=inputFiles/$dir/lib/Source.hs > goldenFiles/$dir/FromLibSrcFile.txt-cabal-cargs --relative --sourcefile=inputFiles/$dir/exe/Source.hs > goldenFiles/$dir/FromExeSrcFile.txt-.txt-cabal-cargs --relative --format=hdevtools --sourcefile=inputFiles/$dir/lib > goldenFiles/$dir/FindCabalFileHdevtools.txt-cabal-cargs --relative --format=hdevtools --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/FromCabalFileHdevtools.txt-cabal-cargs --relative --format=hdevtools --sourcefile=inputFiles/$dir/lib/Source.hs > goldenFiles/$dir/FromLibSrcFileHdevtools.txt-cabal-cargs --relative --format=hdevtools --sourcefile=inputFiles/$dir/exe/Source.hs > goldenFiles/$dir/FromExeSrcFileHdevtools.txt+dirs="withSandbox withoutSandbox"+for dir in $dirs ; do+ cabal-cargs --relative --sourcefile=inputFiles/$dir/lib > goldenFiles/$dir/FindCabalFile.txt+ cabal-cargs --relative --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/FromCabalFile.txt+ cabal-cargs --relative --sourcefile=inputFiles/$dir/lib/Source.hs > goldenFiles/$dir/FromLibSrcFile.txt+ cabal-cargs --relative --sourcefile=inputFiles/$dir/exe/Source.hs > goldenFiles/$dir/FromExeSrcFile.txt+ .txt+ cabal-cargs --relative --format=hdevtools --sourcefile=inputFiles/$dir/lib > goldenFiles/$dir/FindCabalFileHdevtools.txt+ cabal-cargs --relative --format=hdevtools --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/FromCabalFileHdevtools.txt+ cabal-cargs --relative --format=hdevtools --sourcefile=inputFiles/$dir/lib/Source.hs > goldenFiles/$dir/FromLibSrcFileHdevtools.txt+ cabal-cargs --relative --format=hdevtools --sourcefile=inputFiles/$dir/exe/Source.hs > goldenFiles/$dir/FromExeSrcFileHdevtools.txt -cabal-cargs --relative --format=pure --sourcefile=inputFiles/$dir/lib > goldenFiles/$dir/FindCabalFilePure.txt-cabal-cargs --relative --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/FromCabalFilePure.txt-cabal-cargs --relative --format=pure --sourcefile=inputFiles/$dir/lib/Source.hs > goldenFiles/$dir/FromLibSrcPure.txt-cabal-cargs --relative --format=pure --sourcefile=inputFiles/$dir/exe/Source.hs > goldenFiles/$dir/FromExeSrcFilePure.txt+ cabal-cargs --relative --format=pure --sourcefile=inputFiles/$dir/lib > goldenFiles/$dir/FindCabalFilePure.txt+ cabal-cargs --relative --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/FromCabalFilePure.txt+ cabal-cargs --relative --format=pure --sourcefile=inputFiles/$dir/lib/Source.hs > goldenFiles/$dir/FromLibSrcPure.txt+ cabal-cargs --relative --format=pure --sourcefile=inputFiles/$dir/exe/Source.hs > goldenFiles/$dir/FromExeSrcFilePure.txt -cabal-cargs --relative --library --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/AllOfLib.txt-cabal-cargs --relative --executable=cabal-cargs --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/AllOfExe.txt-cabal-cargs --relative --testsuite=tests --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/AllOfTest.txt+ cabal-cargs --relative --library --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/AllOfLib.txt+ cabal-cargs --relative --executable=cabal-cargs --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/AllOfExe.txt+ cabal-cargs --relative --testsuite=tests --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/AllOfTest.txt -cabal-cargs --relative --library --only=ghc_options --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyGhcOptionsOfLib.txt-cabal-cargs --relative --executable=cabal-cargs --only=ghc_options --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyGhcOptionsOfExe.txt-cabal-cargs --relative --testsuite=tests --only=ghc_options --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyGhcOptionsOfTest.txt+ cabal-cargs --relative --library --only=ghc_options --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyGhcOptionsOfLib.txt+ cabal-cargs --relative --executable=cabal-cargs --only=ghc_options --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyGhcOptionsOfExe.txt+ cabal-cargs --relative --testsuite=tests --only=ghc_options --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyGhcOptionsOfTest.txt -cabal-cargs --relative --library --only=hs_source_dirs --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyPureSrcDirsOfLib.txt-cabal-cargs --relative --executable=cabal-cargs --only=hs_source_dirs --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyPureSrcDirsOfExe.txt-cabal-cargs --relative --testsuite=tests --only=hs_source_dirs --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyPureSrcDirsOfTest.txt+ cabal-cargs --relative --library --only=hs_source_dirs --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyPureSrcDirsOfLib.txt+ cabal-cargs --relative --executable=cabal-cargs --only=hs_source_dirs --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyPureSrcDirsOfExe.txt+ cabal-cargs --relative --testsuite=tests --only=hs_source_dirs --format=pure --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/OnlyPureSrcDirsOfTest.txt -cabal-cargs --relative --enable=default_false_flag --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/EnableFlag.txt-cabal-cargs --relative --disable=default_true_flag --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/DisableFlag.txt-cabal-cargs --relative --enable=default_false_flag --disable=default_true_flag --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/EnableAndDisableFlag.txt+ cabal-cargs --relative --enable=default_false_flag --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/EnableFlag.txt+ cabal-cargs --relative --disable=default_true_flag --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/DisableFlag.txt+ cabal-cargs --relative --enable=default_false_flag --disable=default_true_flag --cabalfile=inputFiles/$dir/test.cabal > goldenFiles/$dir/EnableAndDisableFlag.txt+done
tests/takeOutputsAsGoldens view
@@ -1,5 +1,7 @@ #!/usr/bin/env bash-dir=$1-for output in `ls outputFiles/$dir` ; do- cp outputFiles/$dir/$output goldenFiles/$dir/$output+dirs="withSandbox withoutSandbox"+for dir in $dirs ; do+ for output in `ls outputFiles/$dir` ; do+ cp outputFiles/$dir/$output goldenFiles/$dir/$output+ done done