diff --git a/app/Main.hs b/app/Main.hs index 95b1dda4..0ad4d9fa 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -230,7 +230,7 @@ main = do conf <- case march of Nothing -> return Nothing Just path -> Just <$> parseConfig path - + forM_ conf $ saveConfig output_path let exactFrontendType = identifyFrontendType filename frontend_language diff --git a/test/NITTA/Model/Config/Tests.hs b/test/NITTA/Model/Config/Tests.hs index f4873381..d97cf35b 100644 --- a/test/NITTA/Model/Config/Tests.hs +++ b/test/NITTA/Model/Config/Tests.hs @@ -24,9 +24,9 @@ import Test.Tasty.HUnit tests = testGroup "Configuration parsing" - [ testCase "parse config common" $ do - conf <- parseConfig "examples/microarch.yml" - let + [ testCase "parse config common" $ do + conf <- parseConfig "examples/microarch.yml" + let lib = fromJust $ library conf fram = fromJust $ M.lookup (T.pack "fram{x}") lib nets = networks conf @@ -35,21 +35,18 @@ tests = protos_ = fromJust $ protos net shift = fromJust $ M.lookup (T.pack "shift{x}") protos_ div_ = fromJust $ M.lookup (T.pack "div{x}") protos_ - - "Sync" @=? show (ioSync conf) - True @=? mock conf - "fx32.32" @=? T.unpack (valueType conf) - 2 @=? M.size (fromJust $ library conf) - - 32 @=? Conf.size fram - Just True @=? Conf.sRight shift - 4 @=? Conf.pipeline div_ - - "mosi" @=? T.unpack (mosi spi) - "miso" @=? T.unpack (miso spi) - "sclk" @=? T.unpack (sclk spi) - "cs" @=? T.unpack (cs spi) - True @=? isSlave spi - Just 6 @=? bufferSize spi - 0 @=? bounceFilter spi + "Sync" @=? show (ioSync conf) + True @=? mock conf + "fx32.32" @=? T.unpack (valueType conf) + 2 @=? M.size (fromJust $ library conf) + 32 @=? Conf.size fram + Just True @=? Conf.sRight shift + 4 @=? Conf.pipeline div_ + "mosi" @=? T.unpack (mosi spi) + "miso" @=? T.unpack (miso spi) + "sclk" @=? T.unpack (sclk spi) + "cs" @=? T.unpack (cs spi) + True @=? isSlave spi + Just 6 @=? bufferSize spi + 0 @=? bounceFilter spi ]