Commit 74470a03 authored by Valentin Reis's avatar Valentin Reis
Browse files

adds a blank nrm run echo command with no dhrun 'wants'.

parent 71e219dd
Pipeline #7044 failed with stages
in 2 minutes and 39 seconds
......@@ -16,8 +16,86 @@ let argIfTest =
let Powercap = < Cap : Text | NoCap : {} >
let apps =
{ qmcpack =
in { run =
lib.makeBase
( lib.emptyMakeBaseArg "echo" basicManifest cn
⫽ { args =
[ message ]
, verbose =
True
, cmdwants =
[] :List Text
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
}
)
, hello =
lib.makeBase
( lib.emptyMakeBaseArg "echo" basicManifest cn
⫽ { args =
[ message ]
, verbose =
True
, cmdwants =
[ message ]
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
}
)
, listen =
lib.makeExtended
( lib.emptyMakeBaseArg "sleep" basicManifest cn
⫽ { args =
[ "1" ]
, verbose =
True
, cmdwants =
[] : List Text
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
}
)
[ lib.values.emptyCmd
{ name =
"nrm"
, outfile =
"nrmlisten.out"
, errfile =
"nrmlisten.err"
}
⫽ { args = [ "listen", "-u", cn ] }
]
, power =
lib.appTest
( lib.emptyFilterTestArgs "power" "sleep"
⫽ { timeout =
[ 600 ] : Optional Natural
, args =
[ "15" ]
, isTest =
True
}
)
, performance =
lib.appTest
( lib.emptyFilterTestArgs "performance" "sleep"
⫽ { timeout =
[ 600 ] : Optional Natural
, args =
[ "15" ]
, isTest =
True
, manifestname =
"perfwrap.json"
}
)
, qmcpack =
λ(isTest : Bool)
→ λ(powercap : Powercap)
→ lib.extendApp
......@@ -140,71 +218,3 @@ let apps =
)
isTest
}
in { apps =
apps
, hello =
lib.makeBase
( lib.emptyMakeBaseArg "echo" basicManifest cn
⫽ { args =
[ message ]
, verbose =
True
, cmdwants =
[ message ]
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
}
)
, listen =
lib.makeExtended
( lib.emptyMakeBaseArg "sleep" basicManifest cn
⫽ { args =
[ "1" ]
, verbose =
True
, cmdwants =
[] : List Text
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
}
)
[ lib.values.emptyCmd
{ name =
"nrm"
, outfile =
"nrmlisten.out"
, errfile =
"nrmlisten.err"
}
⫽ { args = [ "listen", "-u", cn ] }
]
, power =
lib.appTest
( lib.emptyFilterTestArgs "power" "sleep"
⫽ { timeout =
[ 600 ] : Optional Natural
, args =
[ "15" ]
, isTest =
True
}
)
, performance =
lib.appTest
( lib.emptyFilterTestArgs "performance" "sleep"
⫽ { timeout =
[ 600 ] : Optional Natural
, args =
[ "15" ]
, isTest =
True
, manifestname =
"perfwrap.json"
}
)
}
......@@ -15,6 +15,11 @@
expire_in: 1 week
when: always
testRun:
extends: .test
script:
- "argonix build testRun --argopkgs $ARGOPKGS $EXTRA --verbose"
testHello:
extends: .test
script:
......
......@@ -377,7 +377,7 @@ let
let
dhrunscript = pkgs.writeText "test.dhall" ''
let all = ${dhrunSpecs}/all-tests.dh
in all.apps.${app} True < NoCap = {=} | Cap : Text >
in all.${app} True < NoCap = {=} | Cap : Text >
'';
in
doDhrun dhrunscript;
......@@ -391,6 +391,7 @@ let
doDhrun dhrunscript;
testHello = doDhrunKey "hello";
testRun = doDhrunKey "run";
testListen = doDhrunKey "listen";
testPerfwrapper = doDhrunKey "performance";
testPower = doDhrunKey "power";
......@@ -402,7 +403,7 @@ let
testLAMMPS = addBI (doDhrunApp "lammps") lammps;
testQMCPack = addBI (doDhrunApp "qmcpack") qmcpack ;
testAll = test.overrideAttrs
testAll = (doDhrunKey "hello").overrideAttrs
(old:{
buildInputs = old.buildInputs ++ [
lammps
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment