packaging fixes for new test format

dhrun/lib.dh

@@ -96,7 +96,7 @@ let emptyMakeBaseArg =
           , args =
               [] : List Text
           , verbose =
-              False
+              True
           , cmdwants =
               [] : List Text
           , cmdavoids =

gitlab-ci/integration.yml

@@ -18,27 +18,27 @@
 testPwd:
   extends: .test
   script:
-    - "argonix build testPwd --argopkgs $ARGOPKGS $EXTRA --verbose"
+    - "argonix test pwd --argopkgs $ARGOPKGS $EXTRA --verbose"
 
 testRun:
   extends: .test
   script:
-    - "argonix build testRun --argopkgs $ARGOPKGS $EXTRA --verbose"
+    - "argonix test run --argopkgs $ARGOPKGS $EXTRA --verbose"
 
 testHello:
   extends: .test
   script:
-    - "argonix build testHello --argopkgs $ARGOPKGS $EXTRA --verbose"
+    - "argonix test hello --argopkgs $ARGOPKGS $EXTRA --verbose"
 
 testListen:
   extends: .test
   script:
-    - "argonix build testListen --argopkgs $ARGOPKGS $EXTRA --verbose"
+    - "argonix test listen --argopkgs $ARGOPKGS $EXTRA --verbose"
 
 testPerfwrapper:
   extends: .test
   script:
-    - "argonix build testPerfwrapper --argopkgs $ARGOPKGS $EXTRA --verbose"
+    - "argonix test performance --argopkgs $ARGOPKGS $EXTRA --verbose"
   tags:
     - performance
     - integration
@@ -46,6 +46,6 @@ testPerfwrapper:
 testPower:
   extends: .test
   script:
-    - "argonix build testPower --argopkgs $ARGOPKGS $EXTRA --verbose"
+    - "argonix test power --argopkgs $ARGOPKGS $EXTRA --verbose"
   tags:
     - knl

pkgs/argonix/pin.json

@@ -2,8 +2,8 @@
   "fetch": {
     "args": {
       "fetchSubmodules": false,
-      "rev": "bc7b9efd7f55c4e8f4257ce0813d935fa729326e",
-      "sha256": "0x6xgp5gjn2kp7n1j8v9f5f04fc8wl3dv5b3x40a37x4bvph5npr",
+      "rev": "0ea6332d6101f3b72a9d5c737a268973a0bd84ef",
+      "sha256": "0f5j1kl5gi8ll3s1mszw650hhsvww5vl9n220my1jvqqi3qrx9ah",
       "url": "https://xgitlab.cels.anl.gov/argo/argonix.git"
     },
     "fn": "fetchgit"

pkgs/default.nix

@@ -444,12 +444,6 @@ let
     doDhrun dhrunscript;
 
     testGeneric     = doDhrunKey genericTestName;
-    testHello       = doDhrunKey "hello";
-    testRun         = doDhrunKey "run";
-    testPwd         = doDhrunKey "pwd";
-    testListen      = doDhrunKey "listen";
-    testPerfwrapper = doDhrunKey "performance";
-    testPower       = doDhrunKey "power";
 
     testSTREAM      = addBI (doDhrunApp "stream") stream;
     testAMG         = addBI (doDhrunApp "amg") amg;