wip

.gitignore

@@ -1,16 +1,6 @@
-dist-newstyle
-.direnv/
-.fixme/state.db
-result
-# VS Code
-settings.json
-
-cabal.project.local
-
-*.key
-
-.backup/
-.hbs2-git/
+.fixme-new/refchan.local
+dist-newstyle/
 bin/
-.fixme-new/current-stage.log
-.hbs2-sync/
+.direnv/
+.hbs2-git3/
+

hbs2-tests/test/NCQ3/Endurance.hs

@@ -19,6 +19,7 @@ import Data.Config.Suckless.Script as SC
 import Data.Config.Suckless.System
 
 import NCQTestCommon
+import Tee
 
 import Lens.Micro.Platform
 import Data.Either
@@ -341,6 +342,8 @@ ncq3EnduranceTest = do
                            , "test:ncq3:endurance:inner", testEnvDir
                            ] & setStdin createPipe & setStdout createPipe
 
+      withTeeLogging ( testEnvDir </> "test.log") do
+
         ncqWithStorage testEnvDir $ \sto -> do
           replicateM_ wSeed do
             n <- liftIO $ uniformRM (1, wMaxBlk) g
@@ -497,7 +500,7 @@ ncq3EnduranceTest = do
               EnduranceExit -> do
                 toConsole inp "exit"
                 debug $ yellow "inner process stopped?"
-              liftIO $ race (pause @'Seconds 1) (waitExitCode p) >>= \case
+                liftIO $ race (pause @'Seconds 30) (waitExitCode p) >>= \case
                   Right{} -> none
                   Left{}  -> do
                     debug $ red "force inner process to stop"

hbs2-tests/test/Tee.hs

@@ -82,7 +82,7 @@ stripANSI = go
       case BS.uncons s of
         Nothing       -> BS.empty
         Just (c1, r1)
-          | c1 == lbr -> go (BS.drop1 $ dropCSI r1)    -- ESC [
+          | c1 == lbr -> go (BS.drop 1 $ dropCSI r1)    -- ESC [
           | c1 == rbr -> go (dropOSC r1)    -- ESC ]
           | otherwise -> go r1              -- Прочие короткие ESC-послед.