updates dhall code for new dhrun version

dhrun/all-tests.dh

@@ -6,17 +6,30 @@ in  let cn = "testContainer"
 
 in  let basicManifest = lib.argopkgsManifestDirPath ++ "basic.json"
 
+in  let argIfTest =
+            λ(isTest : Bool)
+          → { isTest =
+                isTest
+            , timeout =
+                      if isTest
+                
+                then  [ 60 ] : Optional Natural
+                
+                else  [] : Optional Natural
+            }
+
 in  let apps =
           { qmcpack =
                 λ(isTest : Bool)
               → lib.progressAppTest
-                ( lib.emptyProgressAppTestArg
-                  "mpiexec"
-                  [ "-n"
-                  , if isTest then "2" else "24"
-                  , "qmcpack"
-                  , lib.qmcPackDir ++ "/simple-H2O.xml"
-                  ]
+                (   lib.emptyProgressAppTestArg
+                    "mpiexec"
+                    [ "-n"
+                    , if isTest then "2" else "24"
+                    , "qmcpack"
+                    , lib.qmcPackDir ++ "/simple-H2O.xml"
+                    ]
+                  ⫽ argIfTest isTest
                 )
           , lammps =
                 λ(isTest : Bool)
@@ -31,7 +44,7 @@ in  let apps =
                     , "-i"
                     , lib.lammpsDir ++ "/modified.lj"
                     ]
-                  ⫽ { isTest = isTest }
+                  ⫽ argIfTest isTest
                 )
           , openmc =
                 λ(isTest : Bool)
@@ -39,7 +52,7 @@ in  let apps =
                   (   lib.emptyProgressAppTestArg
                       "mpiexec"
                       [ "-n", if isTest then "2" else "24", "openmc" ]
-                    ⫽ { isTest = isTest }
+                    ⫽ argIfTest isTest
                   )
                 ⫽ { pre = [ "cp -r \$OPENMC_PWD/* ." ] }
           , amg =
@@ -61,16 +74,14 @@ in  let apps =
                     , "12"
                     , "1"
                     ]
-                  ⫽ { vars =
-                        [ { varname = "OMP_NUM_THREADS", value = "1" } ]
-                    , isTest =
-                        isTest
-                    }
+                  ⫽ argIfTest isTest
+                  ⫽ { vars = [ { varname = "OMP_NUM_THREADS", value = "1" } ] }
                 )
           , stream =
                 λ(isTest : Bool)
               → lib.progressAppTest
                 (   lib.emptyProgressAppTestArg "stream_c" ([] : List Text)
+                  ⫽ argIfTest isTest
                   ⫽ { vars =
                         [ { varname =
                               "OMP_NUM_THREADS"
@@ -79,8 +90,6 @@ in  let apps =
                           }
                         , { varname = "OMP_PLACES", value = "cores" }
                         ]
-                    , isTest =
-                        isTest
                     }
                 )
           }
@@ -88,12 +97,28 @@ in  let apps =
 in  { hello =
         lib.makeBase
         (   lib.emptyMakeBaseArgs "echo" basicManifest cn
-          ⫽ { args = [ message ], verbose = True, cmdwants = [ message ] }
+          ⫽ { args =
+                [ message ]
+            , verbose =
+                True
+            , cmdwants =
+                [ message ]
+            , timeout =
+                [ 60 ] : Optional Natural
+            }
         )
     , listen =
         lib.makeExtended
         (   lib.emptyMakeBaseArgs "sleep" basicManifest cn
-          ⫽ { args = [ "1" ], verbose = True, cmdwants = [] : List Text }
+          ⫽ { args =
+                [ "1" ]
+            , verbose =
+                True
+            , cmdwants =
+                [] : List Text
+            , timeout =
+                [ 60 ] : Optional Natural
+            }
         )
         [   lib.values.emptyCmd
             { name =
@@ -106,9 +131,15 @@ in  { hello =
           ⫽ { args = [ "listen", "-u", cn ] }
         ]
     , power =
-        lib.appTest (lib.emptyFilterTestArgs "power")
+        lib.appTest
+        (   lib.emptyFilterTestArgs "power"
+          ⫽ { timeout = [ 60 ] : Optional Natural }
+        )
     , performance =
-        lib.appTest (lib.emptyFilterTestArgs "performance")
+        lib.appTest
+        (   lib.emptyFilterTestArgs "performance"
+          ⫽ { timeout = [ 60 ] : Optional Natural }
+        )
     , stream =
         apps.stream True
     , openmc =

dhrun/lib.dh

@@ -33,6 +33,8 @@ in  let basicCommand =
                 values.emptyVars
             , passvars =
                 [ "PATH" ]
+            , timeout =
+                [] : Optional Natural
             }
 
 in  let MakeBaseArgs =
@@ -50,6 +52,8 @@ in  let MakeBaseArgs =
               List Text
           , vars :
               List types.EnvVar
+          , timeout :
+              Optional Natural
           }
 
 in  let emptyMakeBaseArgs =
@@ -113,6 +117,8 @@ in  let makeBase =
                           # args.args
                       , passvars =
                           [ "PATH" ]
+                      , timeout =
+                          args.timeout
                       }
                   ]
               , verbosity =
@@ -144,6 +150,8 @@ in  let FilterTestArgs =
               List types.EnvVar
           , isTest :
               Bool
+          , timeout :
+              Optional Natural
           }
 
 in  let emptyFilterTestArgs =
@@ -158,6 +166,8 @@ in  let emptyFilterTestArgs =
                 values.emptyVars
             , isTest =
                 False
+            , timeout =
+                [] : Optional Natural
             }
 
 in  let sleepArgs =
@@ -190,6 +200,8 @@ in  let appTest =
                     [] : List Text
                 , vars =
                     args.vars
+                , timeout =
+                    args.timeout
                 }
                 [     let b =
                             values.emptyCmd
@@ -228,6 +240,8 @@ in  let ProgressAppTestArg =
               List types.EnvVar
           , isTest :
               Bool
+          , timeout :
+              Optional Natural
           }
 
 in  let emptyProgressAppTestArg =
@@ -241,6 +255,8 @@ in  let emptyProgressAppTestArg =
                   [] : List types.EnvVar
               , isTest =
                   False
+              , timeout =
+                  [] : Optional Natural
               }
             : ProgressAppTestArg
 
@@ -256,6 +272,8 @@ in  let progressAppTest =
                     args.vars
                 , isTest =
                     False
+                , timeout =
+                    args.timeout
                 }
             )